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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 9F60EC433DB for ; Fri, 15 Jan 2021 21:06:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50D4A2371F for ; Fri, 15 Jan 2021 21:06:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50D4A2371F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VZ6a8yO+VUonZGejZiCQye86BRMKQjbiLLvGdWlMIT4=; b=NEyOaJowpeqqlPZqATtObXYmZ ky85S1prMgCoSWRHmWpp01ZVQGYgjVufSCxZWJC6J/KgcexHwKWVzshrlZJlQqT4thZGA/Qw6sBzO 4ClD0BcusFwysGn8xYJ6PL31G2vsOv/cCrIYe8jMStM5hCKHRIs49leRUFnP5KalT+6qDXsYqhKcA SbcQbDs4+iJMgWVVLj91gxIUVFM4Sh3UTmxjgx5xipWMGEGOXEwx95J4KBpaTct5x1cla7Ep0K2h0 /rWWv798hB5BKP4kWzwFOL9Xn+3/G9qCY+TGRonTGxDd/p3/sag88hfmg9XMbRlqVdYEi7xUKIVVx irYasWrxA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0WIm-0003L6-S8; Fri, 15 Jan 2021 21:06:36 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0WIj-0003K7-SL; Fri, 15 Jan 2021 21:06:34 +0000 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 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-Disposition: inline In-Reply-To: <20210115125703.1315064-9-maxime@cerno.tech> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210115_160634_038494_F9A7DCAE X-CRM114-Status: GOOD ( 24.48 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko =?utf-8?Q?St=C3=BCbner?= , Xinliang Liu , dri-devel@lists.freedesktop.org, Anitha Chrisanthus , linux-stm32@st-md-mailman.stormreply.com, Jerome Brunet , linux-samsung-soc@vger.kernel.org, Vincent Abriou , Michal Simek , Ludovic Desroches , NXP Linux Team , VMware Graphics , Sascha Hauer , Roland Scheidegger , Inki Dae , Sean Paul , Hyun Kwon , Seung-Woo Kim , linux-kernel@vger.kernel.org, Pengutronix Kernel Team , freedreno@lists.freedesktop.org, Alexandre Belloni , David Airlie , Edmund Dea , virtualization@lists.linux-foundation.org, Eric Anholt , Thierry Reding , Daniel Vetter , Mihail Atanassov , Fabio Estevam , Alexey Brodkin , Jonathan Hunter , linux-rockchip@lists.infradead.org, "James \(Qian\) Wang" , Dave Airlie , Alexandre Torgue , Martin Blumenstingl , linux-arm-msm@vger.kernel.org, Maxime Ripard , John Stultz , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Rodrigo Siqueira , Boris Brezillon , Sandy Huang , Yannick Fertre , Kyungmin Park , Maxime Coquelin , Kevin Hilman , Brian Starkey , Haneen Mohammed , Neil Armstrong , Stefan Agner , Melissa Wen , linux-tegra@vger.kernel.org, Gerd Hoffmann , Benjamin Gaignard , Sam Ravnborg , Xinwei Kong , Krzysztof Kozlowski , Chen-Yu Tsai , Chun-Kuang Hu , Chen Feng , Alison Wang , spice-devel@lists.freedesktop.org, Daniel Vetter , Tomi Valkeinen , Philippe Cornu , Kieran Bingham , Tian Tao , Shawn Guo , Liviu Dudau , Paul Cercueil , Marek Vasut , linux-renesas-soc@vger.kernel.org, Joonyoung Shim , Russell King , Thomas Zimmermann , Maarten Lankhorst , Hans de Goede , linux-mediatek@lists.infradead.org, Laurentiu Palcu , Matthias Brugger , Jernej Skrabec , Nicolas Ferre , Rob Clark , Philipp Zabel , Jyri Sarha , Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic 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 A485DC4332E 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 81B1A23A1C for ; Fri, 15 Jan 2021 21:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727977AbhAOVHq (ORCPT ); Fri, 15 Jan 2021 16:07:46 -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-arm-msm@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 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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 6EE6BC433DB for ; Fri, 15 Jan 2021 21:06:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E245E2371F for ; Fri, 15 Jan 2021 21:06:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E245E2371F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+Hj1AyKvFWz9K8HjsfUURETRf6ByZXLr0hFie+2bF40=; b=al/Zt67hGhH5iNeXkhS0GQ4/o eoISw/Cm8kyDFrl07lBtCkQGUS/AoO44fWF2279ZJ/FH+brdNdzt7VIph8AGkAiJBZIHq0y1tYBO9 B9mEkv/oubwm9eUv81ib3sT0c0hwUrr4zUPRbcGLE3qLzSxuYTUMir9g6TqLro/uvT+KpmobP4l3W 0zeftbswIMFuSd2A/ISO9TT6YGyecAWv2Z6OmPZTiSYgfPjrY6NReldDWzMhJfmKul4DTmqXyRgBl 9eXcSMnvgl61z8IjmaEy2hWipsrBcN9K/TjNV6xOFDPtncwy4kMWe/OCzXy9Gd1YmWV6eHcEQPggK vZea93BWw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0WIn-0003LW-Jc; Fri, 15 Jan 2021 21:06:37 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0WIj-0003K7-SL; Fri, 15 Jan 2021 21:06:34 +0000 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 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-Disposition: inline In-Reply-To: <20210115125703.1315064-9-maxime@cerno.tech> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210115_160634_038494_F9A7DCAE X-CRM114-Status: GOOD ( 24.48 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko =?utf-8?Q?St=C3=BCbner?= , Xinliang Liu , dri-devel@lists.freedesktop.org, Anitha Chrisanthus , linux-stm32@st-md-mailman.stormreply.com, Jerome Brunet , linux-samsung-soc@vger.kernel.org, Vincent Abriou , Michal Simek , Ludovic Desroches , NXP Linux Team , VMware Graphics , Sascha Hauer , Roland Scheidegger , Inki Dae , Sean Paul , Hyun Kwon , Seung-Woo Kim , linux-kernel@vger.kernel.org, Pengutronix Kernel Team , freedreno@lists.freedesktop.org, Alexandre Belloni , David Airlie , Edmund Dea , virtualization@lists.linux-foundation.org, Eric Anholt , Thierry Reding , Daniel Vetter , Mihail Atanassov , Fabio Estevam , Alexey Brodkin , Jonathan Hunter , linux-rockchip@lists.infradead.org, "James \(Qian\) Wang" , Dave Airlie , Alexandre Torgue , Martin Blumenstingl , linux-arm-msm@vger.kernel.org, Maxime Ripard , John Stultz , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Rodrigo Siqueira , Boris Brezillon , Sandy Huang , Yannick Fertre , Kyungmin Park , Maxime Coquelin , Kevin Hilman , Brian Starkey , Haneen Mohammed , Neil Armstrong , Stefan Agner , Melissa Wen , linux-tegra@vger.kernel.org, Gerd Hoffmann , Benjamin Gaignard , Sam Ravnborg , Xinwei Kong , Krzysztof Kozlowski , Chen-Yu Tsai , Chun-Kuang Hu , Chen Feng , Alison Wang , spice-devel@lists.freedesktop.org, Daniel Vetter , Tomi Valkeinen , Philippe Cornu , Kieran Bingham , Tian Tao , Shawn Guo , Liviu Dudau , Paul Cercueil , Marek Vasut , linux-renesas-soc@vger.kernel.org, Joonyoung Shim , Russell King , Thomas Zimmermann , Maarten Lankhorst , Hans de Goede , linux-mediatek@lists.infradead.org, Laurentiu Palcu , Matthias Brugger , Jernej Skrabec , Nicolas Ferre , Rob Clark , Philipp Zabel , Jyri Sarha , Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.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 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 770E4C433DB for ; Fri, 15 Jan 2021 21:06:40 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E458D2371F for ; Fri, 15 Jan 2021 21:06:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E458D2371F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D698C874AA; Fri, 15 Jan 2021 21:06:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7xF7Jp2Z6piH; Fri, 15 Jan 2021 21:06:37 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 8A28087487; Fri, 15 Jan 2021 21:06:37 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 70CBAC0893; Fri, 15 Jan 2021 21:06:37 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2FCEAC013A for ; Fri, 15 Jan 2021 21:06:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1D57186C39 for ; Fri, 15 Jan 2021 21:06:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rqSxIpSJlxey for ; Fri, 15 Jan 2021 21:06:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 33C2C86C35 for ; Fri, 15 Jan 2021 21:06:34 +0000 (UTC) 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 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-Disposition: inline In-Reply-To: <20210115125703.1315064-9-maxime@cerno.tech> Cc: Heiko =?utf-8?Q?St=C3=BCbner?= , Xinliang Liu , dri-devel@lists.freedesktop.org, Anitha Chrisanthus , linux-stm32@st-md-mailman.stormreply.com, Jerome Brunet , linux-samsung-soc@vger.kernel.org, Vincent Abriou , Michal Simek , Ludovic Desroches , NXP Linux Team , VMware Graphics , Sascha Hauer , Roland Scheidegger , Inki Dae , Sean Paul , Hyun Kwon , Seung-Woo Kim , linux-kernel@vger.kernel.org, Pengutronix Kernel Team , freedreno@lists.freedesktop.org, Alexandre Belloni , David Airlie , Edmund Dea , virtualization@lists.linux-foundation.org, Eric Anholt , Thierry Reding , Daniel Vetter , Mihail Atanassov , Fabio Estevam , Alexey Brodkin , Jonathan Hunter , linux-rockchip@lists.infradead.org, "James \(Qian\) Wang" , Dave Airlie , Alexandre Torgue , Martin Blumenstingl , linux-arm-msm@vger.kernel.org, Maxime Ripard , John Stultz , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Rodrigo Siqueira , Boris Brezillon , Sandy Huang , Yannick Fertre , Kyungmin Park , Maxime Coquelin , Kevin Hilman , Brian Starkey , Haneen Mohammed , Neil Armstrong , Stefan Agner , Melissa Wen , linux-tegra@vger.kernel.org, Benjamin Gaignard , Sam Ravnborg , Xinwei Kong , Krzysztof Kozlowski , Chen-Yu Tsai , Chun-Kuang Hu , Chen Feng , Alison Wang , spice-devel@lists.freedesktop.org, Daniel Vetter , Tomi Valkeinen , Philippe Cornu , Kieran Bingham , Tian Tao , Shawn Guo , Liviu Dudau , Paul Cercueil , Marek Vasut , linux-renesas-soc@vger.kernel.org, Joonyoung Shim , Russell King , Thomas Zimmermann , Maarten Lankhorst , Hans de Goede , linux-mediatek@lists.infradead.org, Laurentiu Palcu , Matthias Brugger , Jernej Skrabec , Nicolas Ferre , Rob Clark , Philipp Zabel , Jyri Sarha , Lucas Stach X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" 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 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 5675DC433E0 for ; Fri, 15 Jan 2021 21:06:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EEB412371F for ; Fri, 15 Jan 2021 21:06:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEB412371F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5623E6E47A; Fri, 15 Jan 2021 21:06:35 +0000 (UTC) Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 159966E47A; Fri, 15 Jan 2021 21:06:34 +0000 (UTC) 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 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-Disposition: inline In-Reply-To: <20210115125703.1315064-9-maxime@cerno.tech> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xinliang Liu , dri-devel@lists.freedesktop.org, Anitha Chrisanthus , linux-stm32@st-md-mailman.stormreply.com, Jerome Brunet , linux-samsung-soc@vger.kernel.org, Vincent Abriou , Michal Simek , Ludovic Desroches , NXP Linux Team , VMware Graphics , Sascha Hauer , Roland Scheidegger , Sean Paul , Hyun Kwon , Seung-Woo Kim , linux-kernel@vger.kernel.org, Pengutronix Kernel Team , freedreno@lists.freedesktop.org, Alexandre Belloni , David Airlie , Edmund Dea , virtualization@lists.linux-foundation.org, Thierry Reding , Daniel Vetter , Mihail Atanassov , Alexey Brodkin , Jonathan Hunter , linux-rockchip@lists.infradead.org, "James \(Qian\) Wang" , Dave Airlie , Alexandre Torgue , Martin Blumenstingl , linux-arm-msm@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Rodrigo Siqueira , Boris Brezillon , Sandy Huang , Yannick Fertre , Kyungmin Park , Maxime Coquelin , Kevin Hilman , Haneen Mohammed , Neil Armstrong , Melissa Wen , linux-tegra@vger.kernel.org, Gerd Hoffmann , Sam Ravnborg , Xinwei Kong , Krzysztof Kozlowski , Chen-Yu Tsai , Chun-Kuang Hu , Chen Feng , Alison Wang , spice-devel@lists.freedesktop.org, Tomi Valkeinen , Philippe Cornu , Kieran Bingham , Tian Tao , Shawn Guo , Liviu Dudau , Paul Cercueil , Marek Vasut , linux-renesas-soc@vger.kernel.org, Joonyoung Shim , Russell King , Thomas Zimmermann , Hans de Goede , linux-mediatek@lists.infradead.org, Laurentiu Palcu , Matthias Brugger , Jernej Skrabec , Nicolas Ferre , Jyri Sarha Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel