diff options
| author |   Philipp Zabel <p.zabel@pengutronix.de> | 2014-10-08 17:19:13 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-03 16:19:58 -0800 |
| commit | 7cd9bebee609c4a2e382ad5089f1c24e6098f493 (patch) | |
| tree | 75a1d69c3f91deaf65c4da79094ca2118e2ac001 /drivers | |
| parent | imx-drm: ipuv3-plane: allow local alpha in ipu_plane_mode_set() (diff) | |
| download | linux-dev-7cd9bebee609c4a2e382ad5089f1c24e6098f493.tar.xz linux-dev-7cd9bebee609c4a2e382ad5089f1c24e6098f493.zip | |
imx-drm: ipuv3-plane: move stride setting out of base setup
Setting the stride can only be done on inactive channels, while
the buffer base address can also be updated for running channels
using the hardware double buffering feature.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/imx-drm/ipuv3-plane.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/imx-drm/ipuv3-plane.c b/drivers/staging/imx-drm/ipuv3-plane.c index 48cbeef73934..85f49e6fdee9 100644 --- a/drivers/staging/imx-drm/ipuv3-plane.c +++ b/drivers/staging/imx-drm/ipuv3-plane.c @@ -74,8 +74,6 @@ int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb, dev_dbg(ipu_plane->base.dev->dev, "phys = %pad, x = %d, y = %d", &cma_obj->paddr, x, y); - ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]); - eba = cma_obj->paddr + fb->offsets[0] + fb->pitches[0] * y + (fb->bits_per_pixel >> 3) * x; ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba); @@ -189,6 +187,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, return ret; } ipu_cpmem_set_high_priority(ipu_plane->ipu_ch); + ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]); ret = ipu_plane_set_base(ipu_plane, fb, src_x, src_y); if (ret < 0) |