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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EEC1EB64D8 for ; Wed, 21 Jun 2023 08:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231742AbjFUIGO (ORCPT ); Wed, 21 Jun 2023 04:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231743AbjFUIGE (ORCPT ); Wed, 21 Jun 2023 04:06:04 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20C2B19B7 for ; Wed, 21 Jun 2023 01:06:01 -0700 (PDT) Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qBsqe-0008Km-B6; Wed, 21 Jun 2023 10:05:52 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qBsqd-00056l-Ub; Wed, 21 Jun 2023 10:05:51 +0200 Date: Wed, 21 Jun 2023 10:05:51 +0200 From: Sascha Hauer To: Jonas Karlman Cc: Sandy Huang , Heiko Stuebner , David Airlie , Daniel Vetter , Mark Yao , Andy Yan , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/4] drm/rockchip: vop: Use cleanup helper directly as destroy funcs Message-ID: <20230621080551.GW18491@pengutronix.de> References: <20230620064732.1525594-1-jonas@kwiboo.se> <20230620064732.1525594-3-jonas@kwiboo.se> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230620064732.1525594-3-jonas@kwiboo.se> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 20, 2023 at 06:47:37AM +0000, Jonas Karlman wrote: > vop_plane_destroy and vop_crtc_destroy are plain wrappers around > drm_plane_cleanup and drm_crtc_cleanup. Use them directly as plane and > crtc funcs to closer match VOP2 driver. > > Signed-off-by: Jonas Karlman Reviewed-by: Sascha Hauer Sascha > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 60b23636a3fe..25c873d4ff53 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -766,11 +766,6 @@ static void vop_crtc_atomic_disable(struct drm_crtc *crtc, > } > } > > -static void vop_plane_destroy(struct drm_plane *plane) > -{ > - drm_plane_cleanup(plane); > -} > - > static inline bool rockchip_afbc(u64 modifier) > { > return modifier == ROCKCHIP_AFBC_MOD; > @@ -1131,7 +1126,7 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = { > static const struct drm_plane_funcs vop_plane_funcs = { > .update_plane = drm_atomic_helper_update_plane, > .disable_plane = drm_atomic_helper_disable_plane, > - .destroy = vop_plane_destroy, > + .destroy = drm_plane_cleanup, > .reset = drm_atomic_helper_plane_reset, > .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > @@ -1602,11 +1597,6 @@ static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = { > .atomic_disable = vop_crtc_atomic_disable, > }; > > -static void vop_crtc_destroy(struct drm_crtc *crtc) > -{ > - drm_crtc_cleanup(crtc); > -} > - > static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) > { > struct rockchip_crtc_state *rockchip_state; > @@ -1711,7 +1701,7 @@ vop_crtc_verify_crc_source(struct drm_crtc *crtc, const char *source_name, > static const struct drm_crtc_funcs vop_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > - .destroy = vop_crtc_destroy, > + .destroy = drm_crtc_cleanup, > .reset = vop_crtc_reset, > .atomic_duplicate_state = vop_crtc_duplicate_state, > .atomic_destroy_state = vop_crtc_destroy_state, > @@ -1962,7 +1952,7 @@ static void vop_destroy_crtc(struct vop *vop) > */ > list_for_each_entry_safe(plane, tmp, &drm_dev->mode_config.plane_list, > head) > - vop_plane_destroy(plane); > + drm_plane_cleanup(plane); > > /* > * Destroy CRTC after vop_plane_destroy() since vop_disable_plane() > -- > 2.41.0 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |