diff options
| author |   Dave Airlie <airlied@redhat.com> | 2021-08-27 10:49:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-08-27 10:49:53 +1000 |
| commit | 9fe4f5a24fdac99c484daf29eded9c6685fa2020 (patch) | |
| tree | 814e58103eea812d02575f51b8a8ea1d7f2c468e /drivers/gpu/drm | |
| parent | Merge tag 'amd-drm-fixes-5.14-2021-08-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (diff) | |
| parent | drm/imx: ipuv3-plane: fix accidental partial revert of 8 pixel alignment fix (diff) | |
| download | linux-dev-9fe4f5a24fdac99c484daf29eded9c6685fa2020.tar.xz linux-dev-9fe4f5a24fdac99c484daf29eded9c6685fa2020.zip | |
Merge tag 'imx-drm-fixes-2021-08-18' of git://git.pengutronix.de/pza/linux into drm-fixes
drm/imx: imx-drm alignment and plane offset fixes
Fix an accidental partial revert of commit 94dfec48fca7 ("drm/imx: Add 8
pixel alignment fix") and plane offset calculations for capture of
non-aligned resolutions.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/85a41af99beb2c9e7d6020435a135bf9f205a5ff.camel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 8710f55d2579..bd1f9f0366d3 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -683,7 +683,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, break; } - ipu_dmfc_config_wait4eot(ipu_plane->dmfc, drm_rect_width(dst)); + ipu_dmfc_config_wait4eot(ipu_plane->dmfc, ALIGN(drm_rect_width(dst), 8)); width = ipu_src_rect_width(new_state); height = drm_rect_height(&new_state->src) >> 16; |