summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorFancy Fang <chen.fang@nxp.com>2018-07-29 19:09:31 +0800
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit6b50e5d2d2d61333d9d5fab55327065603ddef2f (patch)
tree787412ae68b1dc355b036ee85d63deec6bbade90 /drivers/gpu/drm
parent079d4599883cc974f9a3d0dff4cfe5ef80ab20eb (diff)
MLK-19083 drm/imx: lcdif: remove untrue condition for pixel format set
After supporting DISPMIX power domain, the LCDIF runtime resume callback always write '0' to 'LCDIF_CTRL' register which will clear previous pixel format related setting. So the previous condition by comparing format change for setting pixel format during plane atomic update is not true anymore. Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/imx/lcdif/lcdif-plane.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/imx/lcdif/lcdif-plane.c b/drivers/gpu/drm/imx/lcdif/lcdif-plane.c
index e1db58e74e0f..5aa0b7edc81e 100644
--- a/drivers/gpu/drm/imx/lcdif/lcdif-plane.c
+++ b/drivers/gpu/drm/imx/lcdif/lcdif-plane.c
@@ -102,7 +102,6 @@ static void lcdif_plane_atomic_update(struct drm_plane *plane,
struct lcdif_soc *lcdif = lcdif_plane->lcdif;
struct drm_plane_state *state = plane->state;
struct drm_framebuffer *fb = state->fb;
- struct drm_framebuffer *old_fb = old_state->fb;
struct drm_gem_cma_object *gem_obj = NULL;
u32 fb_addr, src_off, fb_idx;
@@ -114,8 +113,7 @@ static void lcdif_plane_atomic_update(struct drm_plane *plane,
* and the fb pixel format, since the mode set will
* be done in crtc's ->enable() helper func
*/
- if (plane->type == DRM_PLANE_TYPE_PRIMARY &&
- (!old_fb || fb->pixel_format != old_fb->pixel_format))
+ if (plane->type == DRM_PLANE_TYPE_PRIMARY)
lcdif_set_pix_fmt(lcdif, fb->pixel_format);
switch (plane->type) {