staging: drm/imx: handle framebuffer offsets correctly
authorLucas Stach <l.stach@pengutronix.de>
Fri, 10 Jan 2014 15:17:29 +0000 (16:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2014 23:11:51 +0000 (15:11 -0800)
We didn't take the pixel format into account, so x-direction
offsets were off by a factor of 2 or 4 for 16bpp and 32bpp
framebuffers.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/imx-drm/ipuv3-plane.c

index 685411c..2ef9516 100644 (file)
@@ -78,7 +78,8 @@ int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
        cpmem = ipu_get_cpmem(ipu_plane->ipu_ch);
        ipu_cpmem_set_stride(cpmem, fb->pitches[0]);
 
-       eba = cma_obj->paddr + fb->offsets[0] + fb->pitches[0] * y + x;
+       eba = cma_obj->paddr + fb->offsets[0] +
+             fb->pitches[0] * y + (fb->bits_per_pixel >> 3) * x;
        ipu_cpmem_set_buffer(cpmem, 0, eba);
        ipu_cpmem_set_buffer(cpmem, 1, eba);