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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A217FC5AD5A for ; Wed, 12 Aug 2026 08:08:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97B92886A4; Wed, 12 Aug 2026 08:08:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="fRPOx+//"; dkim-atps=neutral Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 724BE886A4 for ; Wed, 12 Aug 2026 08:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1786522081; bh=xrOvZH+soNDrPtxM9oh9ysL2lvLCCfSblewhWe0D5DQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fRPOx+//mHQ5+fSysq0Bescz9t2jEv9fcXSfrwrCfmZFRKes6fWv8akV2Z0+6xazu GXGJKQcggkdeajuU1acQB4S7N0WQQVYo2aH4Aoep9r8ld0H7hotS+ZKhUSP6jAXIHD e29gyKXtBuI9hpD7XaYnImgRnzybmCAO/UpK5UgAU4pAWTMHxdEdhbDYvUZMqrBTHD iGCqO8cqXWTSflJ8ZdI518gp/zi9t8Vq83r48icXb7n1ACh/pPOnGjNYdOH+2/GjlJ DEm543rvCVD1JGjhRBho01NdvyHrVWW2/F00Z/SGMWXI+I4FeracZjJH7JNVXxlpe7 dTw1WebOJ51uA== Received: from fedora-21.home (unknown [100.64.0.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange secp256r1 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbrezillon) by bali.collaboradmins.com (Postfix) with ESMTPSA id 67D1217E00E9; Wed, 12 Aug 2026 10:08:00 +0200 (CEST) Date: Wed, 12 Aug 2026 10:07:55 +0200 From: Boris Brezillon To: =?UTF-8?B?QWRyacOhbg==?= Larumbe Cc: Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Faith Ekstrand , "Marty E. Plummer" , Tomeu Vizoso , Eric Anholt , Alyssa Rosenzweig , Robin Murphy , Philipp Zabel , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Collabora Kernel Team , Neil Armstrong Subject: Re: [PATCH v5 04/11] drm/panfrost: Move shrinker initialization and unplug one level down Message-ID: <20260812100755.123e7ee0@fedora-21.home> In-Reply-To: <20260811-claude-fixes-v5-4-3d692c9e98c2@collabora.com> References: <20260811-claude-fixes-v5-0-3d692c9e98c2@collabora.com> <20260811-claude-fixes-v5-4-3d692c9e98c2@collabora.com> Organization: Collabora X-Mailer: Claws Mail 4.4.0 (GTK 3.24.52; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, 11 Aug 2026 22:42:13 +0100 Adri=C3=A1n Larumbe wrote: > Since the moment we call drm_dev_register() the device should be in a > position to accept jobs, so it's best if the shrinker is already > initialized by then. >=20 > On top of that, make shrinker functions take an panfrost_device pointer > like other functions in the same sequence and rename them accordingly. >=20 > Essentially mimic the init/fini behaviour in Panthor. >=20 > On top of that, remove the config feature check, because it's unnecessary. >=20 > Signed-off-by: Adri=C3=A1n Larumbe > --- > drivers/gpu/drm/panfrost/panfrost_device.c | 8 +++++++- > drivers/gpu/drm/panfrost/panfrost_drv.c | 6 ------ > drivers/gpu/drm/panfrost/panfrost_gem.c | 25 ++++++++++++++----= ------ > drivers/gpu/drm/panfrost/panfrost_gem.h | 7 ++++--- > drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 8 ++------ > 5 files changed, 28 insertions(+), 26 deletions(-) >=20 > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm= /panfrost/panfrost_device.c > index d8421fd6a662..74992deb0b3a 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > @@ -281,9 +281,14 @@ int panfrost_device_init(struct panfrost_device *pfd= ev) > if (err) > goto out_job; > =20 > - panfrost_gem_init(pfdev); > + err =3D panfrost_gem_init(pfdev); > + if (err) > + goto out_perfcnt; > =20 > return 0; > + > +out_perfcnt: > + panfrost_perfcnt_fini(pfdev); > out_job: > panfrost_jm_fini(pfdev); > out_mmu: > @@ -305,6 +310,7 @@ int panfrost_device_init(struct panfrost_device *pfde= v) > =20 > void panfrost_device_fini(struct panfrost_device *pfdev) > { > + panfrost_gem_fini(pfdev); > panfrost_perfcnt_fini(pfdev); > panfrost_jm_fini(pfdev); > panfrost_mmu_fini(pfdev); > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/pa= nfrost/panfrost_drv.c > index 2e931fa90da0..331a3bd5b98c 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -1002,14 +1002,9 @@ static int panfrost_probe(struct platform_device *= pdev) > if (err < 0) > goto err_out1; > =20 > - err =3D panfrost_gem_shrinker_init(&pfdev->base); > - if (err) > - goto err_out2; > =20 > return 0; > =20 > -err_out2: > - drm_dev_unregister(&pfdev->base); > err_out1: > pm_runtime_disable(pfdev->base.dev); > panfrost_device_fini(pfdev); > @@ -1023,7 +1018,6 @@ static void panfrost_remove(struct platform_device = *pdev) > struct panfrost_device *pfdev =3D platform_get_drvdata(pdev); > =20 > drm_dev_unregister(&pfdev->base); > - panfrost_gem_shrinker_cleanup(&pfdev->base); > =20 > pm_runtime_get_sync(pfdev->base.dev); > pm_runtime_disable(pfdev->base.dev); > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/pa= nfrost/panfrost_gem.c > index 3a7fce428898..7b993a089af2 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_gem.c > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c > @@ -15,20 +15,25 @@ > #include "panfrost_gem.h" > #include "panfrost_mmu.h" > =20 > -void panfrost_gem_init(struct panfrost_device *pfdev) > +int panfrost_gem_init(struct panfrost_device *pfdev) > { > int err; > =20 > - if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && > - !panfrost_transparent_hugepage) > - return; > + if (panfrost_transparent_hugepage) { Hm, are you sure it compiles fine when CONFIG_TRANSPARENT_HUGEPAGE=3Dn? Feels like the linker would complain about a missing symbol in that case. If you really want to simplify it this way, you probably need #if IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) extern bool panfrost_transparent_hugepage; #else #define panfrost_transparent_hugepage false #endif in panfrost_drv.h. > + err =3D drm_gem_huge_mnt_create(&pfdev->base, "within_size"); > + if (drm_gem_get_huge_mnt(&pfdev->base)) > + drm_info(&pfdev->base, "Using Transparent Hugepage\n"); > + else if (err) > + drm_warn(&pfdev->base, > + "Can't use Transparent Hugepage (%d)\n", err); > + } > =20 > - err =3D drm_gem_huge_mnt_create(&pfdev->base, "within_size"); > - if (drm_gem_get_huge_mnt(&pfdev->base)) > - drm_info(&pfdev->base, "Using Transparent Hugepage\n"); > - else if (err) > - drm_warn(&pfdev->base, "Can't use Transparent Hugepage (%d)\n", > - err); > + return panfrost_gem_shrinker_init(pfdev); > +} > + > +void panfrost_gem_fini(struct panfrost_device *pfdev) > +{ > + panfrost_gem_shrinker_fini(pfdev); > } > =20 > #ifdef CONFIG_DEBUG_FS > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.h b/drivers/gpu/drm/pa= nfrost/panfrost_gem.h > index 79d4377019e9..5c823cdbd980 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_gem.h > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h > @@ -129,7 +129,8 @@ drm_mm_node_to_panfrost_mapping(struct drm_mm_node *n= ode) > return container_of(node, struct panfrost_gem_mapping, mmnode); > } > =20 > -void panfrost_gem_init(struct panfrost_device *pfdev); > +int panfrost_gem_init(struct panfrost_device *pfdev); > +void panfrost_gem_fini(struct panfrost_device *pfdev); > =20 > struct drm_gem_object *panfrost_gem_create_object(struct drm_device *dev= , size_t size); > =20 > @@ -154,8 +155,8 @@ panfrost_gem_mapping_get(struct panfrost_gem_object *= bo, > void panfrost_gem_mapping_put(struct panfrost_gem_mapping *mapping); > void panfrost_gem_teardown_mappings_locked(struct panfrost_gem_object *b= o); > =20 > -int panfrost_gem_shrinker_init(struct drm_device *dev); > -void panfrost_gem_shrinker_cleanup(struct drm_device *dev); > +int panfrost_gem_shrinker_init(struct panfrost_device *pfdev); > +void panfrost_gem_shrinker_fini(struct panfrost_device *pfdev); > =20 > void panfrost_gem_set_label(struct drm_gem_object *obj, const char *labe= l); > int panfrost_gem_sync(struct drm_gem_object *obj, u32 type, > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c b/drivers/g= pu/drm/panfrost/panfrost_gem_shrinker.c > index 2fe967a90bcb..fefae87535d6 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c > +++ b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c > @@ -95,10 +95,8 @@ panfrost_gem_shrinker_scan(struct shrinker *shrinker, = struct shrink_control *sc) > * > * This function registers and sets up the panfrost shrinker. > */ > -int panfrost_gem_shrinker_init(struct drm_device *dev) > +int panfrost_gem_shrinker_init(struct panfrost_device *pfdev) > { > - struct panfrost_device *pfdev =3D to_panfrost_device(dev); > - > pfdev->shrinker =3D shrinker_alloc(0, "drm-panfrost"); > if (!pfdev->shrinker) > return -ENOMEM; > @@ -118,10 +116,8 @@ int panfrost_gem_shrinker_init(struct drm_device *de= v) > * > * This function unregisters the panfrost shrinker. > */ > -void panfrost_gem_shrinker_cleanup(struct drm_device *dev) > +void panfrost_gem_shrinker_fini(struct panfrost_device *pfdev) > { > - struct panfrost_device *pfdev =3D to_panfrost_device(dev); > - > if (pfdev->shrinker) > shrinker_free(pfdev->shrinker); > } >=20