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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 7BA94C3F2D2 for ; Fri, 28 Feb 2020 20:32:41 +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 57358246A2 for ; Fri, 28 Feb 2020 20:32:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57358246A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org 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 C9E656E0FF; Fri, 28 Feb 2020 20:32:40 +0000 (UTC) Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id D57926E0FF; Fri, 28 Feb 2020 20:32:39 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id 31213803D5; Fri, 28 Feb 2020 21:32:37 +0100 (CET) Date: Fri, 28 Feb 2020 21:32:35 +0100 From: Sam Ravnborg To: Daniel Vetter Subject: Re: [PATCH 29/51] drm/cirrus: Drop explicit drm_mode_config_cleanup call Message-ID: <20200228203235.GC22966@ravnborg.org> References: <20200227181522.2711142-1-daniel.vetter@ffwll.ch> <20200227181522.2711142-30-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200227181522.2711142-30-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=XpTUx2N9 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=8nJEP1OIZ-IA:10 a=P1BnusSwAAAA:8 a=QyXUC8HyAAAA:8 a=20KFwNOVAAAA:8 a=SJz97ENfAAAA:8 a=7gkXJVJtAAAA:8 a=Z4Rwk6OoAAAA:8 a=-hpWaDvZO2SIxJIrMkMA:9 a=wPNLvfGTeEIA:10 a=D0XLA9XvdZm18NrgonBM:22 a=vFet0B0WnEQeilDPIY6i:22 a=E9Po1WZjFZOl8hwRPBS3:22 a=HkZW87K1Qel5hWWM3VKY:22 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: Gerd Hoffmann , Intel Graphics Development , m.felsch@pengutronix.de, DRI Development , virtualization@lists.linux-foundation.org, Laurent Pinchart , Thomas Zimmermann , Dave Airlie , Daniel Vetter Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Feb 27, 2020 at 07:15:00PM +0100, Daniel Vetter wrote: > We can even delete the drm_driver.release hook now! > = > This is made possible by a preceeding patch which added a drmm_ > cleanup action to drm_mode_config_init(), hence all we need to do to > ensure that drm_mode_config_cleanup() is run on final drm_device > cleanup is check the new error code for _init(). > = > v2: Explain why this cleanup is possible (Laurent). > = > Cc: Laurent Pinchart > Signed-off-by: Daniel Vetter > Cc: Dave Airlie > Cc: Gerd Hoffmann > Cc: Daniel Vetter > Cc: "Noralf Tr=F8nnes" > Cc: Sam Ravnborg > Cc: Thomas Zimmermann > Cc: virtualization@lists.linux-foundation.org Acked-by: Sam Ravnborg But as stated in other post - using drmm_mode_config_init() would make this more readable. Sam > --- > drivers/gpu/drm/cirrus/cirrus.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > = > diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cir= rus.c > index a9d789a56536..6ac0286810ec 100644 > --- a/drivers/gpu/drm/cirrus/cirrus.c > +++ b/drivers/gpu/drm/cirrus/cirrus.c > @@ -510,11 +510,15 @@ static const struct drm_mode_config_funcs cirrus_mo= de_config_funcs =3D { > .atomic_commit =3D drm_atomic_helper_commit, > }; > = > -static void cirrus_mode_config_init(struct cirrus_device *cirrus) > +static int cirrus_mode_config_init(struct cirrus_device *cirrus) > { > struct drm_device *dev =3D &cirrus->dev; > + int ret; > + > + ret =3D drm_mode_config_init(dev); > + if (ret) > + return ret; > = > - drm_mode_config_init(dev); > dev->mode_config.min_width =3D 0; > dev->mode_config.min_height =3D 0; > dev->mode_config.max_width =3D CIRRUS_MAX_PITCH / 2; > @@ -522,15 +526,12 @@ static void cirrus_mode_config_init(struct cirrus_d= evice *cirrus) > dev->mode_config.preferred_depth =3D 16; > dev->mode_config.prefer_shadow =3D 0; > dev->mode_config.funcs =3D &cirrus_mode_config_funcs; > + > + return 0; > } > = > /* ------------------------------------------------------------------ */ > = > -static void cirrus_release(struct drm_device *dev) > -{ > - drm_mode_config_cleanup(dev); > -} > - > DEFINE_DRM_GEM_FOPS(cirrus_fops); > = > static struct drm_driver cirrus_driver =3D { > @@ -544,7 +545,6 @@ static struct drm_driver cirrus_driver =3D { > = > .fops =3D &cirrus_fops, > DRM_GEM_SHMEM_DRIVER_OPS, > - .release =3D cirrus_release, > }; > = > static int cirrus_pci_probe(struct pci_dev *pdev, > @@ -591,7 +591,9 @@ static int cirrus_pci_probe(struct pci_dev *pdev, > if (cirrus->mmio =3D=3D NULL) > goto err_unmap_vram; > = > - cirrus_mode_config_init(cirrus); > + ret =3D cirrus_mode_config_init(cirrus); > + if (ret) > + goto err_cleanup; > = > ret =3D cirrus_conn_init(cirrus); > if (ret < 0) > @@ -613,7 +615,6 @@ static int cirrus_pci_probe(struct pci_dev *pdev, > return 0; > = > err_cleanup: > - drm_mode_config_cleanup(dev); > iounmap(cirrus->mmio); > err_unmap_vram: > iounmap(cirrus->vram); > -- = > 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel