diff options
| author | Liu Ying <gnuiyl@gmail.com> | 2016-07-08 11:40:57 +0200 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-07-12 18:23:55 +0200 |
| commit | ae2531ab70864c00b49a986cd8bdc5eec7ec881a (patch) | |
| tree | e7815c050ea88f586bcab158426b64a99c69b5a2 /drivers/gpu/drm/imx/ipuv3-crtc.c | |
| parent | drm/imx: atomic phase 2 step 1: Wire up state ->reset, ->duplicate and ->destroy (diff) | |
| download | linux-ae2531ab70864c00b49a986cd8bdc5eec7ec881a.tar.xz linux-ae2531ab70864c00b49a986cd8bdc5eec7ec881a.zip | |
drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in ->page_flip
Use drm_atomic_set_fb_for_plane() in the legacy ->page_flip path to track
the pointer plane_state->fb correctly.
Signed-off-by: Liu Ying <gnuiyl@gmail.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx/ipuv3-crtc.c')
| -rw-r--r-- | drivers/gpu/drm/imx/ipuv3-crtc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 8a0ef13c0906..7df51e81d895 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -18,6 +18,7 @@ #include <linux/device.h> #include <linux/platform_device.h> #include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> #include <linux/fb.h> @@ -217,6 +218,9 @@ static int ipu_page_flip(struct drm_crtc *crtc, ipu_crtc->flip_state = IPU_FLIP_SUBMITTED; } + if (crtc->primary->state) + drm_atomic_set_fb_for_plane(crtc->primary->state, fb); + return 0; free_flip_work: |