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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46377EB64D8 for ; Thu, 22 Jun 2023 11:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=zwgBdybJNuAIKuRMCxmjnCbFKftloSW4L+d9F13NiRo=; b=ixr8NlFl91CSwk HVfmtnZjBUJAWO8yYnsYdolp1VSFIU2jNlrp9LAI7BdYtmt5nY0YOXMdB2xwjAy8ANUu02143Q7AZ zdo3IDvregaolD21CZAMUL9eAN1v1V2sHTC2hj7wHjRdOVj8rACj5whzKI0DbZf5/n5a4RmZTvFZD 7+dpm49oG0jQz91nUfvuNIykh0ICdcJmRlfYa/kHzVKyIYYx32zagsyoHIaXmYRUbdfzWYxPqia5t OiyuA56hs+JdSXgaLIbP6yz4CimpsOYYJPvDfb+GpZ7AsQ9tqOFjanrwwPU+RIE6TTYd6Ux8wwlyj ieJGjPkXe9zF2s9iUhxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qCIaI-000QfL-2M; Thu, 22 Jun 2023 11:34:42 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qCIaE-000Qcm-2f for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 11:34:41 +0000 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 1qCIZs-0004YH-U2; Thu, 22 Jun 2023 13:34:16 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qCIZp-0001NE-H1; Thu, 22 Jun 2023 13:34:13 +0200 Date: Thu, 22 Jun 2023 13:34:13 +0200 From: Sascha Hauer To: Jonas Karlman Cc: Sandy Huang , Heiko Stuebner , David Airlie , Daniel Vetter , Andy Yan , Rob Herring , Mark Yao , Maarten Lankhorst , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 5/5] drm/rockchip: vop2: Add missing call to crtc reset helper Message-ID: <20230622113413.GL18491@pengutronix.de> References: <20230621223311.2239547-1-jonas@kwiboo.se> <20230621223311.2239547-6-jonas@kwiboo.se> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230621223311.2239547-6-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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230622_043438_866967_DCE4317C X-CRM114-Status: GOOD ( 26.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Jun 21, 2023 at 10:33:23PM +0000, Jonas Karlman wrote: > Add missing call to crtc reset helper to properly vblank reset. > > Also move vop2_crtc_reset and call vop2_crtc_destroy_state to simplify > and remove duplicated code. > > Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver") > Signed-off-by: Jonas Karlman > --- > v2: > - Add check for allocation failure (Sascha) Reviewed-by: Sascha Hauer Sascha > > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 31 +++++++++----------- > 1 file changed, 14 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > index f725487d02ef..5ba83121a1b9 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > @@ -2080,23 +2080,6 @@ static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = { > .atomic_disable = vop2_crtc_atomic_disable, > }; > > -static void vop2_crtc_reset(struct drm_crtc *crtc) > -{ > - struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state); > - > - if (crtc->state) { > - __drm_atomic_helper_crtc_destroy_state(crtc->state); > - kfree(vcstate); > - } > - > - vcstate = kzalloc(sizeof(*vcstate), GFP_KERNEL); > - if (!vcstate) > - return; > - > - crtc->state = &vcstate->base; > - crtc->state->crtc = crtc; > -} > - > static struct drm_crtc_state *vop2_crtc_duplicate_state(struct drm_crtc *crtc) > { > struct rockchip_crtc_state *vcstate; > @@ -2123,6 +2106,20 @@ static void vop2_crtc_destroy_state(struct drm_crtc *crtc, > kfree(vcstate); > } > > +static void vop2_crtc_reset(struct drm_crtc *crtc) > +{ > + struct rockchip_crtc_state *vcstate = > + kzalloc(sizeof(*vcstate), GFP_KERNEL); > + > + if (crtc->state) > + vop2_crtc_destroy_state(crtc, crtc->state); > + > + if (vcstate) > + __drm_atomic_helper_crtc_reset(crtc, &vcstate->base); > + else > + __drm_atomic_helper_crtc_reset(crtc, NULL); > +} > + > static const struct drm_crtc_funcs vop2_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > -- > 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 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel