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 D490CC433E0 for ; Thu, 21 Jan 2021 23:04:05 +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 37DA823A3A for ; Thu, 21 Jan 2021 23:04:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37DA823A3A 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 A84B56E979; Thu, 21 Jan 2021 23:04:04 +0000 (UTC) Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id F222D6E979; Thu, 21 Jan 2021 23:04:03 +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 2451050E; Fri, 22 Jan 2021 00:04:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1611270241; bh=T5NVDr46xcwrXL27T8VCCkqqocibkcaVgjkVgGiO8ZY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Y8cyClLX8kCaKU5wMc7DQBaagAtpgNWmTZ3+p386BcnpRP0PMgaNeQ9iuSFglc0Sw yxD8mSPCVAnyIXOWj5xsNFm7Htaoj3caG3DKUBN0MGRlEjztlQ48iKJbFja/DHFBKL ztANltlmDf+im+ixzdUmFqsBKC+TOLRQSVr+juDg= Date: Fri, 22 Jan 2021 01:03:42 +0200 From: Laurent Pinchart To: Maxime Ripard Subject: Re: [PATCH v2 09/11] drm/atomic: Pass the full state to planes atomic disable and update Message-ID: References: <20210121163537.1466118-1-maxime@cerno.tech> <20210121163537.1466118-9-maxime@cerno.tech> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210121163537.1466118-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 , Nicolas Ferre , 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 , linux-mips@vger.kernel.org, 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 Thu, Jan 21, 2021 at 05:35:34PM +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 convert the remaining helpers to provide a consistent interface, > this time with the planes atomic_update and atomic_disable. > > 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 > > --- > > Changes from v1: > - Reintroduce the old_plane_state check in zynqmp_disp_crtc_atomic_disable > --- > drivers/gpu/drm/drm_atomic_helper.c | 8 ++++---- > drivers/gpu/drm/drm_simple_kms_helper.c | 4 +++- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 6 ++++-- > 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 +++- > drivers/gpu/drm/tidss/tidss_plane.c | 4 ++-- > drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- > drivers/gpu/drm/xlnx/zynqmp_disp.c | 15 ++++++++------- > include/drm/drm_modeset_helper_vtables.h | 4 ++-- For these, Reviewed-by: Laurent Pinchart > 58 files changed, 211 insertions(+), 123 deletions(-) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel