Commit 1f941ae8 authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman

staging: drm/imx: ipuv3-crtc: immediately update crtc->fb in ipu_page_flip

Since commit 8cf1e981
("drm: Add consistency check for page-flipping") drm_mode_page_flip_ioctl
contains a WARN_ON that triggers if the .page_flip callback didn't update
the crtc->fb pointer to the new framebuffer immediately.
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b92e2f4
...@@ -147,6 +147,7 @@ static int ipu_page_flip(struct drm_crtc *crtc, ...@@ -147,6 +147,7 @@ static int ipu_page_flip(struct drm_crtc *crtc,
ipu_crtc->newfb = fb; ipu_crtc->newfb = fb;
ipu_crtc->page_flip_event = event; ipu_crtc->page_flip_event = event;
crtc->fb = fb;
return 0; return 0;
} }
...@@ -329,7 +330,6 @@ static irqreturn_t ipu_irq_handler(int irq, void *dev_id) ...@@ -329,7 +330,6 @@ static irqreturn_t ipu_irq_handler(int irq, void *dev_id)
imx_drm_handle_vblank(ipu_crtc->imx_crtc); imx_drm_handle_vblank(ipu_crtc->imx_crtc);
if (ipu_crtc->newfb) { if (ipu_crtc->newfb) {
ipu_crtc->base.fb = ipu_crtc->newfb;
ipu_crtc->newfb = NULL; ipu_crtc->newfb = NULL;
ipu_drm_set_base(&ipu_crtc->base, 0, 0); ipu_drm_set_base(&ipu_crtc->base, 0, 0);
ipu_crtc_handle_pageflip(ipu_crtc); ipu_crtc_handle_pageflip(ipu_crtc);
......
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