Skip to content

L
linux
Commit f60b6e7a authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4fa13395
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/gpu/drm/nouveau/nv50_display.c
View file @ f60b6e7a
...@@ -524,6 +524,8 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, ...@@ -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, ...@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7