Merge tag 'sound-fix-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / staging / imx-drm / ipuv3-plane.c

diff --git a/drivers/staging/imx-drm/ipuv3-plane.c b/drivers/staging/imx-drm/ipuv3-plane.c
index d97454a0dffd947a5cf51d039f7c816ea2145748..34b642a12f8bb2cb6163b1fa05eeca184aef135b 100644 (file)
--- a/drivers/staging/imx-drm/ipuv3-plane.c
+++ b/drivers/staging/imx-drm/ipuv3-plane.c
@@ -64,6 +64,7 @@ int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
 {
        struct ipu_ch_param __iomem *cpmem;
        struct drm_gem_cma_object *cma_obj;
+       unsigned long eba;
 
        cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
        if (!cma_obj) {
@@ -76,8 +77,15 @@ 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]);
-       ipu_cpmem_set_buffer(cpmem, 0, 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);
+
+       /* cache offsets for subsequent pageflips */
+       ipu_plane->x = x;
+       ipu_plane->y = y;
 
        return 0;
 }