diff options
| author | Liu Ying | 2016-10-18 10:44:03 +0200 |
|---|---|---|
| committer | Philipp Zabel | 2016-10-18 11:02:12 +0200 |
| commit | e73aca5184ad9fc948ba22b4d35dce11db35bb25 (patch) | |
| tree | 2dcf04fbe2eef1ccfa608ae769fb6c873b242821 /drivers/gpu/drm/imx | |
| parent | drm/imx: drm_dev_alloc() returns error pointers (diff) | |
| download | kernel-qcow2-linux-e73aca5184ad9fc948ba22b4d35dce11db35bb25.tar.gz kernel-qcow2-linux-e73aca5184ad9fc948ba22b4d35dce11db35bb25.tar.xz kernel-qcow2-linux-e73aca5184ad9fc948ba22b4d35dce11db35bb25.zip | |
drm/imx: ipuv3-plane: Access old u/vbo properly in ->atomic_check for YU12/YV12
Before accessing the u/v offset(aka, u/vbo for IPUv3) of the old plane state's
relevant fb, we should make sure the fb is in YU12 or YV12 pixel format(which
are the two YUV pixel formats we support only), otherwise, we are likely to
trigger BUG_ON() in drm_plane_state_to_u/vbo() since the fb's pixel format is
probably not YU12 or YV12.
Link: https://bugs.freedesktop.org/show_bug.cgi?id=98150
Fixes: c6c1f9bc798b ("drm/imx: Add active plane reconfiguration support")
Cc: stable@vger.kernel.org # 4.8
Signed-off-by: Liu Ying <gnuiyl@gmail.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx')
| -rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index cfb34b595d15..5c342997863e 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -355,7 +355,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane, if ((ubo > 0xfffff8) || (vbo > 0xfffff8)) return -EINVAL; - if (old_fb) { + if (old_fb && + (old_fb->pixel_format == DRM_FORMAT_YUV420 || + old_fb->pixel_format == DRM_FORMAT_YVU420)) { old_ubo = drm_plane_state_to_ubo(old_state); old_vbo = drm_plane_state_to_vbo(old_state); if (ubo != old_ubo || vbo != old_vbo) |