Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/nv50/kms: prevent lockdep false-positive in page flipping path

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs 12 years ago
parent
4fa133954e
commit
f60b6e7a60
1 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 2
      drivers/gpu/drm/nouveau/nv50_display.c

+ 2 - 2
drivers/gpu/drm/nouveau/nv50_display.c
View File 

@@ -524,6 +524,8 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb,
 
 	swap_interval <<= 4;
 
 	swap_interval <<= 4;
 
 	if (swap_interval == 0)
 
 	if (swap_interval == 0)
 
 		swap_interval |= 0x100;
 
 		swap_interval |= 0x100;
 
+	if (chan == NULL)
 
+		evo_sync(crtc->dev);
 
 
 
 	push = evo_wait(sync, 128);
 
 	push = evo_wait(sync, 128);
 
 	if (unlikely(push == NULL))
 
 	if (unlikely(push == NULL))
 
@@ -586,8 +588,6 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb,
 
 		sync->addr ^= 0x10;
 
 		sync->addr ^= 0x10;
 
 		sync->data++;
 
 		sync->data++;
 
 		FIRE_RING (chan);
 
 		FIRE_RING (chan);
 
-	} else {
 
-		evo_sync(crtc->dev);
 
 	}
 
 	}
 
 
 
 	/* queue the flip */
 
 	/* queue the flip */