提交 ee7c10e1 编写于 作者: M Mario Kleiner 提交者: Eric Anholt

drm/vc4: Fix drm_vblank_put/get imbalance in page flip path.

The async page flip path was missing drm_crtc_vblank_get/put
completely. The sync flip path was missing a vblank put, so async
flips only reported proper pageflip completion events by chance,
and vblank irq's never turned off after a first vsync'ed page flip
until system reboot.

Tested against Raspian kernel 4.4.8 tree on RPi 2B.
Signed-off-by: NMario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: NEric Anholt <eric@anholt.net>
Fixes: b501bacc ("drm/vc4: Add support for async pageflips.")
上级 792293cf
...@@ -506,6 +506,7 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) ...@@ -506,6 +506,7 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc)
if (vc4_crtc->event) { if (vc4_crtc->event) {
drm_crtc_send_vblank_event(crtc, vc4_crtc->event); drm_crtc_send_vblank_event(crtc, vc4_crtc->event);
vc4_crtc->event = NULL; vc4_crtc->event = NULL;
drm_crtc_vblank_put(crtc);
} }
spin_unlock_irqrestore(&dev->event_lock, flags); spin_unlock_irqrestore(&dev->event_lock, flags);
} }
...@@ -556,6 +557,7 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb) ...@@ -556,6 +557,7 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb)
spin_unlock_irqrestore(&dev->event_lock, flags); spin_unlock_irqrestore(&dev->event_lock, flags);
} }
drm_crtc_vblank_put(crtc);
drm_framebuffer_unreference(flip_state->fb); drm_framebuffer_unreference(flip_state->fb);
kfree(flip_state); kfree(flip_state);
...@@ -598,6 +600,8 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, ...@@ -598,6 +600,8 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
return ret; return ret;
} }
WARN_ON(drm_crtc_vblank_get(crtc) != 0);
/* Immediately update the plane's legacy fb pointer, so that later /* Immediately update the plane's legacy fb pointer, so that later
* modeset prep sees the state that will be present when the semaphore * modeset prep sees the state that will be present when the semaphore
* is released. * is released.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册