From: Maxime Ripard <maxime@cerno.tech> To: Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie> Cc: Sean Paul <sean@poorly.run>, Dom Cobley <dom@raspberrypi.com>, Tim Gover <tim.gover@raspberrypi.com>, Dave Stevenson <dave.stevenson@raspberrypi.com>, linux-arm-msm@vger.kernel.org, Abhinav Kumar <quic_abhinavk@quicinc.com>, dri-devel@lists.freedesktop.org, Maxime Ripard <maxime@cerno.tech>, Thomas Zimmermann <tzimmermann@suse.de>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, freedreno@lists.freedesktop.org, Phil Elwell <phil@raspberrypi.com> Subject: [PATCH v2 12/22] drm/msm/mdp5: Remove redundant zpos initialisation Date: Mon, 21 Feb 2022 10:59:08 +0100 [thread overview] Message-ID: <20220221095918.18763-13-maxime@cerno.tech> (raw) In-Reply-To: <20220221095918.18763-1-maxime@cerno.tech> The mdp 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 mdp5_plane_reset(). However, the helpers have been adjusted to set it properly at reset, so this is not needed anymore. Cc: freedreno@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Sean Paul <sean@poorly.run> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index c6b69afcbac8..5d8ac84c510b 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -48,6 +48,8 @@ static void mdp5_plane_destroy(struct drm_plane *plane) static void mdp5_plane_install_properties(struct drm_plane *plane, struct drm_mode_object *obj) { + unsigned int zpos; + drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0 | @@ -59,7 +61,12 @@ static void mdp5_plane_install_properties(struct drm_plane *plane, BIT(DRM_MODE_BLEND_PIXEL_NONE) | BIT(DRM_MODE_BLEND_PREMULTI) | BIT(DRM_MODE_BLEND_COVERAGE)); - drm_plane_create_zpos_property(plane, 1, 1, 255); + + if (plane->type == DRM_PLANE_TYPE_PRIMARY) + zpos = STAGE_BASE; + else + zpos = STAGE0 + drm_plane_index(plane); + drm_plane_create_zpos_property(plane, zpos, 1, 255); } static void @@ -91,13 +98,6 @@ static void mdp5_plane_reset(struct drm_plane *plane) kfree(to_mdp5_plane_state(plane->state)); mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); - - if (plane->type == DRM_PLANE_TYPE_PRIMARY) - mdp5_state->base.zpos = STAGE_BASE; - else - mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane); - mdp5_state->base.normalized_zpos = mdp5_state->base.zpos; - __drm_atomic_helper_plane_reset(plane, &mdp5_state->base); } -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <maxime@cerno.tech> To: Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie> Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>, Phil Elwell <phil@raspberrypi.com>, Tim Gover <tim.gover@raspberrypi.com>, Dom Cobley <dom@raspberrypi.com>, dri-devel@lists.freedesktop.org, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, Maxime Ripard <maxime@cerno.tech>, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Abhinav Kumar <quic_abhinavk@quicinc.com>, Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Subject: [PATCH v2 12/22] drm/msm/mdp5: Remove redundant zpos initialisation Date: Mon, 21 Feb 2022 10:59:08 +0100 [thread overview] Message-ID: <20220221095918.18763-13-maxime@cerno.tech> (raw) In-Reply-To: <20220221095918.18763-1-maxime@cerno.tech> The mdp 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 mdp5_plane_reset(). However, the helpers have been adjusted to set it properly at reset, so this is not needed anymore. Cc: freedreno@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Sean Paul <sean@poorly.run> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index c6b69afcbac8..5d8ac84c510b 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -48,6 +48,8 @@ static void mdp5_plane_destroy(struct drm_plane *plane) static void mdp5_plane_install_properties(struct drm_plane *plane, struct drm_mode_object *obj) { + unsigned int zpos; + drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0 | @@ -59,7 +61,12 @@ static void mdp5_plane_install_properties(struct drm_plane *plane, BIT(DRM_MODE_BLEND_PIXEL_NONE) | BIT(DRM_MODE_BLEND_PREMULTI) | BIT(DRM_MODE_BLEND_COVERAGE)); - drm_plane_create_zpos_property(plane, 1, 1, 255); + + if (plane->type == DRM_PLANE_TYPE_PRIMARY) + zpos = STAGE_BASE; + else + zpos = STAGE0 + drm_plane_index(plane); + drm_plane_create_zpos_property(plane, zpos, 1, 255); } static void @@ -91,13 +98,6 @@ static void mdp5_plane_reset(struct drm_plane *plane) kfree(to_mdp5_plane_state(plane->state)); mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); - - if (plane->type == DRM_PLANE_TYPE_PRIMARY) - mdp5_state->base.zpos = STAGE_BASE; - else - mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane); - mdp5_state->base.normalized_zpos = mdp5_state->base.zpos; - __drm_atomic_helper_plane_reset(plane, &mdp5_state->base); } -- 2.35.1
next prev parent reply other threads:[~2022-02-21 9:59 UTC|newest] Thread overview: 66+ 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 ` 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:58 ` 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 ` 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 ` 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 ` Maxime Ripard 2022-02-21 9:59 ` Maxime Ripard 2022-02-21 9:59 ` [PATCH v2 11/22] drm/imx: ipuv3-plane: " Maxime Ripard 2022-02-21 9:59 ` Maxime Ripard 2022-02-21 9:59 ` Maxime Ripard [this message] 2022-02-21 9:59 ` [PATCH v2 12/22] drm/msm/mdp5: " Maxime Ripard 2022-02-25 17:14 ` (subset) " Maxime Ripard 2022-02-25 17:14 ` Maxime Ripard 2022-02-21 9:59 ` [PATCH v2 13/22] drm/nouveau/kms: " Maxime Ripard 2022-02-21 9:59 ` [Nouveau] " Maxime Ripard 2022-02-21 16:42 ` Karol Herbst 2022-02-21 16:42 ` Karol Herbst 2022-02-22 14:02 ` Maxime Ripard 2022-02-22 14:02 ` [Nouveau] " Maxime Ripard 2022-02-22 21:35 ` Karol Herbst 2022-02-22 21:35 ` Karol Herbst 2022-02-22 20:36 ` [Nouveau] " Lyude Paul 2022-02-22 20:36 ` Lyude Paul 2022-02-25 17:14 ` (subset) [Nouveau] " Maxime Ripard 2022-02-25 17:14 ` [Nouveau] (subset) " 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 ` [PATCH v2 15/22] drm/rcar: " Maxime Ripard 2022-02-21 9:59 ` Maxime Ripard 2022-02-25 17:14 ` (subset) " Maxime Ripard 2022-02-25 17:14 ` 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-21 9:59 ` Maxime Ripard 2022-02-21 9:59 ` Maxime Ripard 2022-02-25 17:14 ` (subset) " Maxime Ripard 2022-02-25 17:14 ` Maxime Ripard 2022-02-25 17:14 ` 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 ` 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-13-maxime@cerno.tech \ --to=maxime@cerno.tech \ --cc=airlied@linux.ie \ --cc=daniel.vetter@intel.com \ --cc=dave.stevenson@raspberrypi.com \ --cc=dmitry.baryshkov@linaro.org \ --cc=dom@raspberrypi.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=phil@raspberrypi.com \ --cc=quic_abhinavk@quicinc.com \ --cc=sean@poorly.run \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.