Commit 81d55354 authored by Liu Ying's avatar Liu Ying Committed by Philipp Zabel

drm/imx: ipuv3-plane: Skip setting u/vbo only when we don't need modeset

We added active plane reconfiguration support by forcing a full modeset
operation.  So, looking at old_plane_state->fb to determine whether we need
to set u/v offset(aka, u/vbo for IPUv3) in ipu_plane_atomic_set_base()
or not is no more correct.  Instead, we should do that only when we don't
need modeset.

Fixes: c6c1f9bc ("drm/imx: Add active plane reconfiguration support")
Cc: stable@vger.kernel.org # 4.8
Signed-off-by: default avatarLiu Ying <gnuiyl@gmail.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 43daa013
...@@ -103,8 +103,7 @@ drm_plane_state_to_vbo(struct drm_plane_state *state) ...@@ -103,8 +103,7 @@ drm_plane_state_to_vbo(struct drm_plane_state *state)
(state->src_x >> 16) / 2 - eba; (state->src_x >> 16) / 2 - eba;
} }
static void ipu_plane_atomic_set_base(struct ipu_plane *ipu_plane, static void ipu_plane_atomic_set_base(struct ipu_plane *ipu_plane)
struct drm_plane_state *old_state)
{ {
struct drm_plane *plane = &ipu_plane->base; struct drm_plane *plane = &ipu_plane->base;
struct drm_plane_state *state = plane->state; struct drm_plane_state *state = plane->state;
...@@ -118,7 +117,7 @@ static void ipu_plane_atomic_set_base(struct ipu_plane *ipu_plane, ...@@ -118,7 +117,7 @@ static void ipu_plane_atomic_set_base(struct ipu_plane *ipu_plane,
switch (fb->pixel_format) { switch (fb->pixel_format) {
case DRM_FORMAT_YUV420: case DRM_FORMAT_YUV420:
case DRM_FORMAT_YVU420: case DRM_FORMAT_YVU420:
if (old_state->fb) if (!drm_atomic_crtc_needs_modeset(crtc_state))
break; break;
/* /*
...@@ -393,7 +392,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, ...@@ -393,7 +392,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
struct drm_crtc_state *crtc_state = state->crtc->state; struct drm_crtc_state *crtc_state = state->crtc->state;
if (!drm_atomic_crtc_needs_modeset(crtc_state)) { if (!drm_atomic_crtc_needs_modeset(crtc_state)) {
ipu_plane_atomic_set_base(ipu_plane, old_state); ipu_plane_atomic_set_base(ipu_plane);
return; return;
} }
} }
...@@ -438,7 +437,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, ...@@ -438,7 +437,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
ipu_cpmem_set_high_priority(ipu_plane->ipu_ch); ipu_cpmem_set_high_priority(ipu_plane->ipu_ch);
ipu_idmac_set_double_buffer(ipu_plane->ipu_ch, 1); ipu_idmac_set_double_buffer(ipu_plane->ipu_ch, 1);
ipu_cpmem_set_stride(ipu_plane->ipu_ch, state->fb->pitches[0]); ipu_cpmem_set_stride(ipu_plane->ipu_ch, state->fb->pitches[0]);
ipu_plane_atomic_set_base(ipu_plane, old_state); ipu_plane_atomic_set_base(ipu_plane);
ipu_plane_enable(ipu_plane); ipu_plane_enable(ipu_plane);
} }
......
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