From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o11.zoho.com (sender4-op-o11.zoho.com [136.143.188.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9701F21D5B0 for ; Wed, 12 Aug 2026 01:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.11 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786497600; cv=pass; b=IA0cQlYeRx00jsz1yl8m0nXY4ViEwHKPhC6Q0ZqpWv/PdazGsDE3xiS6tt48LpoVMxyRFcnKmwWX0B7YJ/pIndbw70bhG6FShGlvB5GZNoLrNixmQ5b3pK53CiQmi9sAouMY9nrSbxHGSG5v1ZRMKETxFAF62dgASJGQkGt7kuk= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786497600; c=relaxed/simple; bh=n7BikFCgrQkmdJSXNvSu0V1R2W3qHBki7Zx20sRRT6E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gkNxBGfPMU+eXzijemOnMEQ0LkPv0tRRFAYTvrU03whLhpLvjH0dP70BQRuVqClsJrH1UNSL2qn5Fj2/CGKnfMqTaAqksZFWvjhAMH+cZlkHPiVZd2BUP6mZ6C4NdLm24kQMm0LLIxM0BCr5VdaJDr3r+gOiePj0O6NGSVU3ZWs= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=kioQPDMM; arc=pass smtp.client-ip=136.143.188.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="kioQPDMM" ARC-Seal: i=1; a=rsa-sha256; t=1786497560; cv=none; d=zohomail.com; s=zohoarc; b=eVSlAQTGK0yNdOyMNH+I5T8IoI+f/FsJIMo4sk4SwICFXfs0vX7xSHvrwltrUJJkujWics5QGFGc+31NOllAZeSM887kHmaR3GWEWjq482+ZKryhOIZkRJ8DQxt3yoL2PyficIDwY5jNSLawuYDSx5XOPcrO3zA8RzVfohSvFDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786497560; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=jCSm3meYzvQLFiXJ0sQMFRSJNjkJmqDEW+Xi/EPlvQk=; b=AZF+7ShxWIAtl/YYiGHEAurjXR3AwR9IfexuFuvXi7xQRRPczYajAL0Qg93TYnEDbiSjMWK0maainFZRHHJg2SkMr3OpCb/52IVSzGNN/O/FjburrR7QfIOrPKLL5kaG0nYG4q9YcgMAkT1/WoLVJME3BjbPEE8Q4gXQBHSf0Q8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1786497560; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=Date:Date:From:From:To:To:Cc:Cc:Subject:Subject:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:Message-Id:Reply-To; bh=jCSm3meYzvQLFiXJ0sQMFRSJNjkJmqDEW+Xi/EPlvQk=; b=kioQPDMM3tMbwU8A8rwvyXCL73gKDO8MS0Jp1ydqZHLDkvivuBHxVaFlnyQEwSds ydkS9GiDrZmzFmVV/JGycWd4G2U6DBdviqTbe4nzS9gMY8CZ2DyaRK/042PVeefqhFL VQv8uH0XR0ei0rgS9msO4GhBdG7yr4soYNrvW2IY= Received: by mx.zohomail.com with SMTPS id 1786497558310751.332136099451; Tue, 11 Aug 2026 18:19:18 -0700 (PDT) Date: Wed, 12 Aug 2026 02:19:12 +0100 From: =?utf-8?Q?Adri=C3=A1n?= Larumbe To: Steven Price Cc: Boris Brezillon , Rob Herring , 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 v4 04/13] drm/panfrost: Move shrinker initialization and unplug one level down Message-ID: References: <20260729-claude-fixes-v4-0-01968f2ec77a@collabora.com> <20260729-claude-fixes-v4-4-01968f2ec77a@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-0.2.10.1.5.2/286.485.37 Hi Steven, On 30.07.2026 11:39, Steven Price wrote: > On 29/07/2026 03:54, Adrián 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. > > > > On top of that, make shrinker functions take an panfrost_device pointer > > like other functions in the same sequence and rename them accordingly. > > > > Essentially mimic the init/fini behaviour in Panthor. > > > > Signed-off-by: Adrián Larumbe > > --- > > drivers/gpu/drm/panfrost/panfrost_device.c | 8 +++++++- > > drivers/gpu/drm/panfrost/panfrost_drv.c | 6 ------ > > drivers/gpu/drm/panfrost/panfrost_gem.c | 19 ++++++++++--------- > > drivers/gpu/drm/panfrost/panfrost_gem.h | 6 +++--- > > drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 8 ++------ > > 5 files changed, 22 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > > index d8421fd6a662..03905495aee2 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 *pfdev) > > if (err) > > goto out_job; > > > > - panfrost_gem_init(pfdev); > > + err = panfrost_gem_init(pfdev); > > + if (err) > > + goto out_perfcnt; > > > > 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 *pfdev) > > > > void panfrost_device_fini(struct panfrost_device *pfdev) > > { > > + panfrost_gem_shrinker_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/panfrost/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; > > > > - err = panfrost_gem_shrinker_init(&pfdev->base); > > - if (err) > > - goto err_out2; > > > > return 0; > > > > -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 = platform_get_drvdata(pdev); > > > > drm_dev_unregister(&pfdev->base); > > - panfrost_gem_shrinker_cleanup(&pfdev->base); > > > > 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/panfrost/panfrost_gem.c > > index 3a7fce428898..aa3a604b3439 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_gem.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c > > @@ -15,20 +15,21 @@ > > #include "panfrost_gem.h" > > #include "panfrost_mmu.h" > > > > -void panfrost_gem_init(struct panfrost_device *pfdev) > > +int panfrost_gem_init(struct panfrost_device *pfdev) > > { > > int err; > > > > if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && > > - !panfrost_transparent_hugepage) > > - return; > > + panfrost_transparent_hugepage) { > > Note you haven't quite inverted the condition here, but I don't think > the new condition is wrong - we skip the otherwise no-op helpers. The > old condition seems a bit backward. Indeed I'm not really sure why we > bother with the IS_ENABLED() check at all. But the new code looks fine. I've heeded your advice and done away with the IS_ENABLED() check in v5. I'm curious about why that would work though. Is it because the linker initialises symbols marked as 'extern' to 0 when they aren't resolved? Otherwise I would've assumed the compiler would throw out a missing definition error at link time, but then again I'm unsure about this. > Reviewed-by: Steven Price > > Thanks, > Steve > > > + err = 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); > > + } > > > > - err = 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); > > } > > > > #ifdef CONFIG_DEBUG_FS > > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.h b/drivers/gpu/drm/panfrost/panfrost_gem.h > > index 79d4377019e9..d6e55c2e4d86 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_gem.h > > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h > > @@ -129,7 +129,7 @@ drm_mm_node_to_panfrost_mapping(struct drm_mm_node *node) > > return container_of(node, struct panfrost_gem_mapping, mmnode); > > } > > > > -void panfrost_gem_init(struct panfrost_device *pfdev); > > +int panfrost_gem_init(struct panfrost_device *pfdev); > > > > struct drm_gem_object *panfrost_gem_create_object(struct drm_device *dev, size_t size); > > > > @@ -154,8 +154,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 *bo); > > > > -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); > > > > void panfrost_gem_set_label(struct drm_gem_object *obj, const char *label); > > int panfrost_gem_sync(struct drm_gem_object *obj, u32 type, > > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c b/drivers/gpu/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 = to_panfrost_device(dev); > > - > > pfdev->shrinker = shrinker_alloc(0, "drm-panfrost"); > > if (!pfdev->shrinker) > > return -ENOMEM; > > @@ -118,10 +116,8 @@ int panfrost_gem_shrinker_init(struct drm_device *dev) > > * > > * 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 = to_panfrost_device(dev); > > - > > if (pfdev->shrinker) > > shrinker_free(pfdev->shrinker); > > } > > Adrian Larumbe