From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Maxime Ripard <maxime@cerno.tech>
Cc: "Xinliang Liu" <xinliang.liu@linaro.org>,
dri-devel@lists.freedesktop.org,
"Anitha Chrisanthus" <anitha.chrisanthus@intel.com>,
linux-stm32@st-md-mailman.stormreply.com,
"Jerome Brunet" <jbrunet@baylibre.com>,
linux-samsung-soc@vger.kernel.org,
"Kevin Hilman" <khilman@baylibre.com>,
"Michal Simek" <michal.simek@xilinx.com>,
"NXP Linux Team" <linux-imx@nxp.com>,
"VMware Graphics" <linux-graphics-maintainer@vmware.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Roland Scheidegger" <sroland@vmware.com>,
"Sean Paul" <sean@poorly.run>, "Hyun Kwon" <hyun.kwon@xilinx.com>,
"Seung-Woo Kim" <sw0312.kim@samsung.com>,
linux-kernel@vger.kernel.org,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Alex Deucher" <alexander.deucher@amd.com>,
freedreno@lists.freedesktop.org,
"David Airlie" <airlied@linux.ie>,
nouveau@lists.freedesktop.org,
"Edmund Dea" <edmund.j.dea@intel.com>,
virtualization@lists.linux-foundation.org,
"Thierry Reding" <thierry.reding@gmail.com>,
"Daniel Vetter" <daniel.vetter@intel.com>,
"Mihail Atanassov" <mihail.atanassov@arm.com>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
linux-rockchip@lists.infradead.org,
"James (Qian) Wang" <james.qian.wang@arm.com>,
"Ben Skeggs" <bskeggs@redhat.com>,
"Dave Airlie" <airlied@redhat.com>,
"Alexandre Torgue" <alexandre.torgue@st.com>,
"Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
linux-arm-msm@vger.kernel.org, linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
"Rodrigo Siqueira" <rodrigosiqueiramelo@gmail.com>,
"Sandy Huang" <hjc@rock-chips.com>,
"Yannick Fertre" <yannick.fertre@st.com>,
"Kyungmin Park" <kyungmin.park@samsung.com>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Haneen Mohammed" <hamohammed.sa@gmail.com>,
"Neil Armstrong" <narmstrong@baylibre.com>,
"Melissa Wen" <melissa.srw@gmail.com>,
linux-tegra@vger.kernel.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Xinwei Kong" <kong.kongxinwei@hisilicon.com>,
amd-gfx@lists.freedesktop.org, "Chen-Yu Tsai" <wens@csie.org>,
"Chun-Kuang Hu" <chunkuang.hu@kernel.org>,
"Chen Feng" <puck.chen@hisilicon.com>,
"Alison Wang" <alison.wang@nxp.com>,
spice-devel@lists.freedesktop.org,
"Tomi Valkeinen" <tomba@kernel.org>,
"Philippe Cornu" <philippe.cornu@st.com>,
"Vincent Abriou" <vincent.abriou@st.com>,
"Kieran Bingham" <kieran.bingham+renesas@ideasonboard.com>,
"Tian Tao" <tiantao6@hisilicon.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Christian König" <christian.koenig@amd.com>,
"Liviu Dudau" <liviu.dudau@arm.com>,
"Paul Cercueil" <paul@crapouillou.net>,
linux-renesas-soc@vger.kernel.org,
"Joonyoung Shim" <jy0922.shim@samsung.com>,
"Russell King" <linux@armlinux.org.uk>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
linux-mediatek@lists.infradead.org,
"Laurentiu Palcu" <laurentiu.palcu@oss.nxp.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Jernej Skrabec" <jernej.skrabec@siol.net>,
"Jyri Sarha" <jyri.sarha@iki.fi>
Subject: Re: [PATCH 02/10] drm: Rename plane atomic_check state names
Date: Fri, 15 Jan 2021 22:28:59 +0200 [thread overview]
Message-ID: <YAH7C0EOsisHhqvR@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20210115125703.1315064-2-maxime@cerno.tech>
Hi Maxime,
Thank you for the patch.
On Fri, Jan 15, 2021 at 01:56:54PM +0100, Maxime Ripard wrote:
> Most drivers call the argument to the plane atomic_check hook simply
> state, which is going to conflict with the global atomic state in a
> later rework. Let's rename it to new_plane_state (or new_state depending
> on the convention used in the driver).
>
> This was done using the coccinelle script below, and built tested:
>
> @ plane_atomic_func @
> identifier helpers;
> identifier func;
> @@
>
> static const struct drm_plane_helper_funcs helpers = {
> .atomic_check = func,
> };
>
> @ has_old_state @
> identifier plane_atomic_func.func;
> identifier plane;
> expression e;
> symbol old_state;
> symbol state;
> @@
>
> func(struct drm_plane *plane, struct drm_plane_state *state)
> {
> ...
> struct drm_plane_state *old_state = e;
> ...
> }
>
> @ depends on has_old_state @
> identifier plane_atomic_func.func;
> identifier plane;
> symbol old_state;
> @@
>
> func(struct drm_plane *plane,
> - struct drm_plane_state *state
> + struct drm_plane_state *new_state
> )
> {
> <+...
> - state
> + new_state
> ...+>
> }
>
> @ has_state @
> identifier plane_atomic_func.func;
> identifier plane;
> symbol state;
> @@
>
> func(struct drm_plane *plane, struct drm_plane_state *state)
> {
> ...
> }
>
> @ depends on has_state @
> identifier plane_atomic_func.func;
> identifier plane;
> symbol old_state;
> @@
>
> func(struct drm_plane *plane,
> - struct drm_plane_state *state
> + struct drm_plane_state *new_plane_state
> )
> {
> <+...
> - state
> + new_plane_state
> ...+>
> }
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
[...]
> drivers/gpu/drm/omapdrm/omap_plane.c | 19 +++++----
> drivers/gpu/drm/rcar-du/rcar_du_plane.c | 7 ++--
> drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 7 ++--
> drivers/gpu/drm/xlnx/zynqmp_disp.c | 10 +++--
For these, with the comment below addressed,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 41 files changed, 402 insertions(+), 357 deletions(-)
[snip]
> diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
> index 51dc24acea73..78d0eb1fd69d 100644
> --- a/drivers/gpu/drm/omapdrm/omap_plane.c
> +++ b/drivers/gpu/drm/omapdrm/omap_plane.c
> @@ -99,18 +99,19 @@ static void omap_plane_atomic_disable(struct drm_plane *plane,
> }
>
> static int omap_plane_atomic_check(struct drm_plane *plane,
> - struct drm_plane_state *state)
> + struct drm_plane_state *new_plane_state)
> {
> struct drm_crtc_state *crtc_state;
>
> - if (!state->fb)
> + if (!new_plane_state->fb)
> return 0;
>
> /* crtc should only be NULL when disabling (i.e., !state->fb) */
s/state/new_plane_state/ here too ?
> - if (WARN_ON(!state->crtc))
> + if (WARN_ON(!new_plane_state->crtc))
> return 0;
>
> - crtc_state = drm_atomic_get_existing_crtc_state(state->state, state->crtc);
> + crtc_state = drm_atomic_get_existing_crtc_state(new_plane_state->state,
> + new_plane_state->crtc);
> /* we should have a crtc state if the plane is attached to a crtc */
> if (WARN_ON(!crtc_state))
> return 0;
> @@ -118,17 +119,17 @@ static int omap_plane_atomic_check(struct drm_plane *plane,
> if (!crtc_state->enable)
> return 0;
>
> - if (state->crtc_x < 0 || state->crtc_y < 0)
> + if (new_plane_state->crtc_x < 0 || new_plane_state->crtc_y < 0)
> return -EINVAL;
>
> - if (state->crtc_x + state->crtc_w > crtc_state->adjusted_mode.hdisplay)
> + if (new_plane_state->crtc_x + new_plane_state->crtc_w > crtc_state->adjusted_mode.hdisplay)
I can't help thinking we're using too long variable names... :-(
> return -EINVAL;
>
> - if (state->crtc_y + state->crtc_h > crtc_state->adjusted_mode.vdisplay)
> + if (new_plane_state->crtc_y + new_plane_state->crtc_h > crtc_state->adjusted_mode.vdisplay)
> return -EINVAL;
>
> - if (state->rotation != DRM_MODE_ROTATE_0 &&
> - !omap_framebuffer_supports_rotation(state->fb))
> + if (new_plane_state->rotation != DRM_MODE_ROTATE_0 &&
> + !omap_framebuffer_supports_rotation(new_plane_state->fb))
> return -EINVAL;
>
> return 0;
[...]
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-15 20:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 12:56 [PATCH 01/10] drm/atomic: Pass the full state to planes async atomic check and update Maxime Ripard
2021-01-15 12:56 ` [PATCH 02/10] drm: Rename plane atomic_check state names Maxime Ripard
2021-01-15 13:46 ` Thomas Zimmermann
2021-01-15 14:13 ` Maxime Ripard
2021-01-15 20:28 ` Laurent Pinchart [this message]
2021-01-15 12:56 ` [PATCH 03/10] drm/atmel-hlcdc: Rename custom plane state variable Maxime Ripard
2021-01-15 20:43 ` Sam Ravnborg
2021-01-18 17:02 ` Maxime Ripard
2021-01-15 12:56 ` [PATCH 04/10] drm/atomic: Pass the full state to planes atomic_check Maxime Ripard
2021-01-15 20:39 ` Laurent Pinchart
2021-01-15 12:56 ` [PATCH 05/10] drm: Use the state pointer directly in " Maxime Ripard
2021-01-15 20:42 ` Laurent Pinchart
2021-01-15 12:56 ` [PATCH 06/10] drm: Use state helper instead of plane state pointer in atomic_check Maxime Ripard
2021-01-15 12:56 ` [PATCH 07/10] drm: Store new plane state in a variable for atomic_update and disable Maxime Ripard
2021-01-15 20:57 ` Laurent Pinchart
2021-01-15 12:57 ` [PATCH 08/10] drm: Rename plane->state variables in atomic update " Maxime Ripard
2021-01-15 12:57 ` [PATCH 09/10] drm/atomic: Pass the full state to planes atomic disable and update Maxime Ripard
2021-01-15 21:06 ` Laurent Pinchart
2021-01-15 12:57 ` [PATCH 10/10] drm: Use state helper instead of the plane state pointer Maxime Ripard
2021-01-15 21:20 ` Laurent Pinchart
2021-01-20 13:50 ` Maxime Ripard
2021-01-15 13:34 ` [PATCH 01/10] drm/atomic: Pass the full state to planes async atomic check and update Thomas Zimmermann
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=YAH7C0EOsisHhqvR@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=alexandre.torgue@st.com \
--cc=alison.wang@nxp.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=anitha.chrisanthus@intel.com \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=chunkuang.hu@kernel.org \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=edmund.j.dea@intel.com \
--cc=freedreno@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=hjc@rock-chips.com \
--cc=hyun.kwon@xilinx.com \
--cc=james.qian.wang@arm.com \
--cc=jbrunet@baylibre.com \
--cc=jernej.skrabec@siol.net \
--cc=jonathanh@nvidia.com \
--cc=jy0922.shim@samsung.com \
--cc=jyri.sarha@iki.fi \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=kong.kongxinwei@hisilicon.com \
--cc=kraxel@redhat.com \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=laurentiu.palcu@oss.nxp.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=liviu.dudau@arm.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=matthias.bgg@gmail.com \
--cc=maxime@cerno.tech \
--cc=mcoquelin.stm32@gmail.com \
--cc=melissa.srw@gmail.com \
--cc=michal.simek@xilinx.com \
--cc=mihail.atanassov@arm.com \
--cc=narmstrong@baylibre.com \
--cc=nouveau@lists.freedesktop.org \
--cc=paul@crapouillou.net \
--cc=philippe.cornu@st.com \
--cc=puck.chen@hisilicon.com \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=s.hauer@pengutronix.de \
--cc=sean@poorly.run \
--cc=shawnguo@kernel.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=sroland@vmware.com \
--cc=sunpeng.li@amd.com \
--cc=sw0312.kim@samsung.com \
--cc=thierry.reding@gmail.com \
--cc=tiantao6@hisilicon.com \
--cc=tomba@kernel.org \
--cc=tzimmermann@suse.de \
--cc=vincent.abriou@st.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=wens@csie.org \
--cc=xinliang.liu@linaro.org \
--cc=yannick.fertre@st.com \
/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;
as well as URLs for NNTP newsgroup(s).