summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx
diff options
context:
space:
mode:
authorMaxime Ripard <maxime@cerno.tech>2022-02-21 10:59:07 +0100
committerPhilipp Zabel <p.zabel@pengutronix.de>2022-04-04 09:34:21 +0200
commitaa72b0866a0375d3694dd929a366433b4f5ee2b5 (patch)
treeef215e1df4846de821421efd14cd8565fdd66372 /drivers/gpu/drm/imx
parent090fd63d99f26eb0180f4152c7272085b6556886 (diff)
downloadlinux-stable-aa72b0866a0375d3694dd929a366433b4f5ee2b5.tar.gz
linux-stable-aa72b0866a0375d3694dd929a366433b4f5ee2b5.tar.bz2
linux-stable-aa72b0866a0375d3694dd929a366433b4f5ee2b5.zip
drm/imx: ipuv3-plane: Remove redundant zpos initialisation
The imx KMS driver will call drm_plane_create_zpos_property() with an init value depending on the plane purpose. Since the initial value wasn't carried over in the state, the driver had to set it again in ipu_plane_state_reset(). However, the helpers have been adjusted to set it properly at reset, so this is not needed anymore. Cc: linux-arm-kernel@lists.infradead.org Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Fabio Estevam <festevam@gmail.com> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Link: https://lore.kernel.org/r/20220221095918.18763-12-maxime@cerno.tech
Diffstat (limited to 'drivers/gpu/drm/imx')
-rw-r--r--drivers/gpu/drm/imx/ipuv3-plane.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 846c1aae69c8..414bdf08d0b0 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -297,7 +297,6 @@ void ipu_plane_disable_deferred(struct drm_plane *plane)
static void ipu_plane_state_reset(struct drm_plane *plane)
{
- unsigned int zpos = (plane->type == DRM_PLANE_TYPE_PRIMARY) ? 0 : 1;
struct ipu_plane_state *ipu_state;
if (plane->state) {
@@ -311,8 +310,6 @@ static void ipu_plane_state_reset(struct drm_plane *plane)
if (ipu_state) {
__drm_atomic_helper_plane_reset(plane, &ipu_state->base);
- ipu_state->base.zpos = zpos;
- ipu_state->base.normalized_zpos = zpos;
ipu_state->base.color_encoding = DRM_COLOR_YCBCR_BT601;
ipu_state->base.color_range = DRM_COLOR_YCBCR_LIMITED_RANGE;
}