From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 384B8C43381 for ; Fri, 15 Jan 2021 21:08:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A30D239D1 for ; Fri, 15 Jan 2021 21:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387452AbhAOVHr (ORCPT ); Fri, 15 Jan 2021 16:07:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729204AbhAOVHo (ORCPT ); Fri, 15 Jan 2021 16:07:44 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E86EC06179F; Fri, 15 Jan 2021 13:06:34 -0800 (PST) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D77A258B; Fri, 15 Jan 2021 22:06:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1610744792; bh=T6hbV1O1oRjYL8zdng4qI1ulSsCeoFenYqaoA4x2R1U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=p+HucoNHt8b2/xNw2SqwXz+mxRCAMPmim4GRd9N7lVM740JU7m+MeQeAmI23QbbZJ 5b2DgI1hHEzzRPPfkCkaIrro6c0Xzs3tmqlHK++ZReexfl/MjcWXoizCyFa49MR3MP FeLurhztnooLUnIirndDiO8cTiqI3R4yaO82o0cg= Date: Fri, 15 Jan 2021 23:06:14 +0200 From: Laurent Pinchart To: Maxime Ripard Cc: Maarten Lankhorst , Thomas Zimmermann , Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org, Alexey Brodkin , Daniel Vetter , "James (Qian) Wang" , Liviu Dudau , Mihail Atanassov , Brian Starkey , Russell King , Dave Airlie , Sam Ravnborg , Boris Brezillon , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , Maxime Ripard , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Krzysztof Kozlowski , Stefan Agner , Alison Wang , Xinliang Liu , Tian Tao , John Stultz , Xinwei Kong , Chen Feng , Laurentiu Palcu , Lucas Stach , Philipp Zabel , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Paul Cercueil , Anitha Chrisanthus , Edmund Dea , Chun-Kuang Hu , Matthias Brugger , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Rob Clark , Sean Paul , Marek Vasut , Tomi Valkeinen , Gerd Hoffmann , Kieran Bingham , Sandy Huang , Heiko =?utf-8?Q?St=C3=BCbner?= , Benjamin Gaignard , Vincent Abriou , Yannick Fertre , Philippe Cornu , Maxime Coquelin , Alexandre Torgue , Chen-Yu Tsai , Jernej Skrabec , Thierry Reding , Jonathan Hunter , Jyri Sarha , Hans de Goede , Eric Anholt , Rodrigo Siqueira , Melissa Wen , Haneen Mohammed , VMware Graphics , Roland Scheidegger , Hyun Kwon , Michal Simek , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, virtualization@lists.linux-foundation.org, spice-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-tegra@vger.kernel.org Subject: Re: [PATCH 09/10] drm/atomic: Pass the full state to planes atomic disable and update Message-ID: References: <20210115125703.1315064-1-maxime@cerno.tech> <20210115125703.1315064-9-maxime@cerno.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210115125703.1315064-9-maxime@cerno.tech> Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Hi Maxime, Thank you for the patch. On Fri, Jan 15, 2021 at 01:57:01PM +0100, Maxime Ripard wrote: > The current atomic helpers have either their object state being passed as > an argument or the full atomic state. > > The former is the pattern that was done at first, before switching to the > latter for new hooks or when it was needed. > > Let's start convert all the remaining helpers to provide a consistent s/start convert/convert/ ? > interface, starting with the planes atomic_update and atomic_disable. You're not starting anymore, its 09/10 already :-) > The conversion was done using the coccinelle script below, built tested on > all the drivers. > > @@ > identifier plane, plane_state; > symbol state; > @@ > > struct drm_plane_helper_funcs { > ... > void (*atomic_update)(struct drm_plane *plane, > - struct drm_plane_state *plane_state); > + struct drm_atomic_state *state); > ... > } > > @@ > identifier plane, plane_state; > symbol state; > @@ > > struct drm_plane_helper_funcs { > ... > void (*atomic_disable)(struct drm_plane *plane, > - struct drm_plane_state *plane_state); > + struct drm_atomic_state *state); > ... > } > > @ plane_atomic_func @ > identifier helpers; > identifier func; > @@ > > ( > static const struct drm_plane_helper_funcs helpers = { > ..., > .atomic_update = func, > ..., > }; > | > static const struct drm_plane_helper_funcs helpers = { > ..., > .atomic_disable = func, > ..., > }; > ) > > @@ > struct drm_plane_helper_funcs *FUNCS; > identifier f; > identifier crtc_state; > identifier plane, plane_state, state; > expression e; > @@ > > f(struct drm_crtc_state *crtc_state) > { > ... > struct drm_atomic_state *state = e; > <+... > ( > - FUNCS->atomic_disable(plane, plane_state) > + FUNCS->atomic_disable(plane, state) > | > - FUNCS->atomic_update(plane, plane_state) > + FUNCS->atomic_update(plane, state) > ) > ...+> > } > > @@ > identifier plane_atomic_func.func; > identifier plane; > symbol state; > @@ > > func(struct drm_plane *plane, > - struct drm_plane_state *state) > + struct drm_plane_state *old_plane_state) > { > <... > - state > + old_plane_state > ...> > } > > @ ignores_old_state @ > identifier plane_atomic_func.func; > identifier plane, old_state; > @@ > > func(struct drm_plane *plane, struct drm_plane_state *old_state) > { > ... when != old_state > } > > @ adds_old_state depends on plane_atomic_func && !ignores_old_state @ > identifier plane_atomic_func.func; > identifier plane, plane_state; > @@ > > func(struct drm_plane *plane, struct drm_plane_state *plane_state) > { > + struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane); > ... > } > > @ depends on plane_atomic_func @ > identifier plane_atomic_func.func; > identifier plane, plane_state; > @@ > > func(struct drm_plane *plane, > - struct drm_plane_state *plane_state > + struct drm_atomic_state *state > ) > { ... } > > @ include depends on adds_old_state @ > @@ > > #include > > @ no_include depends on !include && adds_old_state @ > @@ > > + #include > #include > > @@ > identifier plane_atomic_func.func; > identifier plane, state; > identifier plane_state; > @@ > > func(struct drm_plane *plane, struct drm_atomic_state *state) { > ... > struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane); > <+... > - plane_state->state > + state > ...+> > } > > Signed-off-by: Maxime Ripard > --- [snip] > drivers/gpu/drm/drm_atomic_helper.c | 8 ++++---- > drivers/gpu/drm/drm_simple_kms_helper.c | 4 +++- > drivers/gpu/drm/omapdrm/omap_plane.c | 4 ++-- > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +++- > drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +++- > include/drm/drm_modeset_helper_vtables.h | 4 ++-- For these, Reviewed-by: Laurent Pinchart For drivers/gpu/drm/xlnx/zynqmp_disp.c, please see below. [snip] > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c > index e278680b7d5a..39f9e6e76064 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -1166,8 +1166,10 @@ zynqmp_disp_plane_atomic_check(struct drm_plane *plane, > > static void > zynqmp_disp_plane_atomic_disable(struct drm_plane *plane, > - struct drm_plane_state *old_state) > + struct drm_atomic_state *state) > { > + struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state, > + plane); > struct zynqmp_disp_layer *layer = plane_to_layer(plane); > > if (!old_state->fb) > @@ -1178,8 +1180,10 @@ zynqmp_disp_plane_atomic_disable(struct drm_plane *plane, > > static void > zynqmp_disp_plane_atomic_update(struct drm_plane *plane, > - struct drm_plane_state *old_state) > + struct drm_atomic_state *state) > { > + struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state, > + plane); > struct drm_plane_state *new_state = plane->state; > struct zynqmp_disp_layer *layer = plane_to_layer(plane); > bool format_changed = false; > @@ -1485,20 +1489,12 @@ static void > zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > - struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, > - crtc); > struct zynqmp_disp *disp = crtc_to_disp(crtc); > - struct drm_plane_state *old_plane_state; > > /* > - * Disable the plane if active. The old plane state can be NULL in the > - * .shutdown() path if the plane is already disabled, skip > - * zynqmp_disp_plane_atomic_disable() in that case. > + * Disable the plane if active. > */ > - old_plane_state = drm_atomic_get_old_plane_state(old_crtc_state->state, > - crtc->primary); > - if (old_plane_state) You're removing this check, but there's no safeguard in zynqmp_disp_plane_atomic_disable(). Can drm_atomic_get_old_plane_state() return NULL there ? > - zynqmp_disp_plane_atomic_disable(crtc->primary, old_plane_state); > + zynqmp_disp_plane_atomic_disable(crtc->primary, state); > > zynqmp_disp_disable(disp); > [snip] > -- Regards, Laurent Pinchart