diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-03-19 15:20:00 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-03-19 15:26:38 +1000 |
| commit | f60b6e7a6078ceae438a95b808be04cd98f9909a (patch) | |
| tree | c26079d0691e3f284582ccee1f3631878dab73cc /drivers/gpu | |
| parent | 4fa133954e91b83cfa22947579154c6f16e1b2b4 (diff) | |
| download | op-kernel-dev-f60b6e7a6078ceae438a95b808be04cd98f9909a.zip op-kernel-dev-f60b6e7a6078ceae438a95b808be04cd98f9909a.tar.gz | |
drm/nv50/kms: prevent lockdep false-positive in page flipping path
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 2db5799..7f0e6c3 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -524,6 +524,8 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, swap_interval <<= 4; if (swap_interval == 0) swap_interval |= 0x100; + if (chan == NULL) + evo_sync(crtc->dev); push = evo_wait(sync, 128); if (unlikely(push == NULL)) @@ -586,8 +588,6 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, sync->addr ^= 0x10; sync->data++; FIRE_RING (chan); - } else { - evo_sync(crtc->dev); } /* queue the flip */ |
