Merge tag 'imx-drm-fixes-2021-08-18' of git://git.pengutronix.de/pza/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 27 Aug 2021 00:49:32 +0000 (10:49 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 27 Aug 2021 00:49:53 +0000 (10:49 +1000)
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

Trivial merge