From: Maxime Ripard <maxime@cerno.tech>
To: Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie>
Cc: Dom Cobley <dom@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
dri-devel@lists.freedesktop.org,
linux-renesas-soc@vger.kernel.org,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>,
Maxime Ripard <maxime@cerno.tech>,
Thomas Zimmermann <tzimmermann@suse.de>,
Phil Elwell <phil@raspberrypi.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: [PATCH v2 15/22] drm/rcar: plane: Remove redundant zpos initialisation
Date: Mon, 21 Feb 2022 10:59:11 +0100 [thread overview]
Message-ID: <20220221095918.18763-16-maxime@cerno.tech> (raw)
In-Reply-To: <20220221095918.18763-1-maxime@cerno.tech>
The rcar-du KMS driver will call drm_plane_create_zpos_property() with an
init value depending on the plane type.
Since the initial value wasn't carried over in the state, the driver had
to set it again in rcar_du_plane_reset() and rcar_du_vsp_plane_reset().
However, the helpers have been adjusted to set it properly at reset, so
this is not needed anymore.
Cc: linux-renesas-soc@vger.kernel.org
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/rcar-du/rcar_du_plane.c | 1 -
drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index 862197be1e01..9dda5e06457d 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -696,7 +696,6 @@ static void rcar_du_plane_reset(struct drm_plane *plane)
state->hwindex = -1;
state->source = RCAR_DU_PLANE_MEMORY;
state->colorkey = RCAR_DU_COLORKEY_NONE;
- state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
}
static int rcar_du_plane_atomic_set_property(struct drm_plane *plane,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
index b7fc5b069cbc..719c60034952 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -362,7 +362,6 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane)
return;
__drm_atomic_helper_plane_reset(plane, &state->state);
- state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
}
static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = {
--
2.35.1
next prev parent reply other threads:[~2022-02-21 10:00 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 9:58 [PATCH v2 00/22] drm: Fill in default values for plane properties Maxime Ripard
2022-02-21 9:58 ` [PATCH v2 01/22] drm/komeda: plane: switch to plane reset helper Maxime Ripard
2022-02-25 13:59 ` Liviu Dudau
2022-03-08 11:04 ` (subset) " Maxime Ripard
2022-02-21 9:58 ` [PATCH v2 02/22] drm/tegra: " Maxime Ripard
2022-02-21 9:58 ` [PATCH v2 03/22] drm/tegra: hub: Fix zpos initial value mismatch Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 04/22] drm/omap: plane: " Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 05/22] drm/amd/display: Fix color encoding mismatch Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 06/22] drm/object: Add drm_object_property_get_default_value() function Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 07/22] drm/object: Add default zpos value at reset Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 08/22] drm/tegra: plane: Remove redundant zpos initialisation Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 09/22] drm/komeda: " Maxime Ripard
2022-02-25 13:59 ` Liviu Dudau
2022-03-08 11:04 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 10/22] drm/exynos: " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 11/22] drm/imx: ipuv3-plane: " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 12/22] drm/msm/mdp5: " Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 13/22] drm/nouveau/kms: " Maxime Ripard
2022-02-21 16:42 ` Karol Herbst
2022-02-22 14:02 ` Maxime Ripard
2022-02-22 21:35 ` Karol Herbst
2022-02-22 20:36 ` Lyude Paul
2022-02-25 17:14 ` (subset) [Nouveau] " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 14/22] drm/omap: plane: " Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` Maxime Ripard [this message]
2022-02-25 17:14 ` (subset) [PATCH v2 15/22] drm/rcar: " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 16/22] drm/sti: " Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 17/22] drm/sun4i: layer: " Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 18/22] drm/object: Add default color encoding and range value at reset Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 19/22] drm/komeda: plane: Remove redundant color encoding and range initialisation Maxime Ripard
2022-02-25 14:01 ` Liviu Dudau
2022-03-08 11:04 ` (subset) " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 20/22] drm/armada: overlay: " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 21/22] drm/imx: ipuv3-plane: " Maxime Ripard
2022-02-21 9:59 ` [PATCH v2 22/22] drm/omap: plane: " Maxime Ripard
2022-02-25 17:14 ` (subset) " Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220221095918.18763-16-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dom@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=phil@raspberrypi.com \
--cc=tim.gover@raspberrypi.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox