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 96F74C61DD6 for ; Wed, 2 Sep 2026 15:36:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C8F9D10F26B; Wed, 2 Sep 2026 15:36:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="XmHhJsAU"; dkim-atps=neutral Received: from sender6-op-o11.zoho.com (sender6-op-o11.zoho.com [165.173.180.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 147E010F26B for ; Wed, 2 Sep 2026 15:36:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1788363386; cv=none; d=zohomail.com; s=zohoarc; b=Uz3CSDNOwhbSRIQA04r+8Hns5HK1tvvCJCUFFveHWDWqTccAfeFkKWJnGHrB3aJr8IVRm/xTzi47mroc+1eMrvssPPa/pvfIOl59Gq0WJ2W240I6uMeMlaZn7f0Li+UExXqHBEVf7/bnKYvd8Q/fv48FiEYqR1elzsXm4lGQpy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788363386; 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=zrseYKXPJI+lDE/RaHmIqyZ1DcdW9dHQYIB9oIcqUtg=; b=YxL34Txk2hE12ehq+u2tHWCS8K66Ndr2FSPm9PisvBLqTLLUcgGuxVBMTG6qYVCUV7NAPzElDcw+RYnc2qeGuro4RX47WwyGCB2k8N9zm8VmjjlB9CHsSs2kv/C815U2EmX55ucbL2yp6RXHEVePOMtDum7fi7Pe/aPpNiUYftM= 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=1788363386; 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=zrseYKXPJI+lDE/RaHmIqyZ1DcdW9dHQYIB9oIcqUtg=; b=XmHhJsAUA6UpkgcvPTeD1AvtOZnFKm3s1O8rBRm/cMoLiY+9P0Vqr8LRj2llrzay zZH312QemPzCWm1s9WAl3lAlh3GDzRA8+WbkWKIkStmJur4qWOFLvafqCgVd/UaL7Dq NQEhSFlLcEym3H7hl1v08n5QYuwn/Q2L1MzYvLro= Received: by mx.zohomail.com with SMTPS id 1788363384002507.3276519476119; Wed, 2 Sep 2026 08:36:24 -0700 (PDT) Date: Wed, 2 Sep 2026 16:36:17 +0100 From: =?utf-8?Q?Adri=C3=A1n?= Larumbe To: Boris Brezillon 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 v7 01/17] drm/panfrost: Move shrinker initialization and unplug one level down Message-ID: References: <20260828-claude-fixes-v7-0-72a13b2c125d@collabora.com> <20260828-claude-fixes-v7-1-72a13b2c125d@collabora.com> <20260901132802.66d9aba6@fedora-21.home> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260901132802.66d9aba6@fedora-21.home> X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-0.2.13.1.5.4/288.352.18 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 01.09.2026 13:28, Boris Brezillon wrote: > On Fri, 28 Aug 2026 21:56:41 +0100 > 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. > > > > On top of that, remove the config feature check, because it's unnecessary. > > I don't think that's accurate anymore (we still have a config check, > except it's encoded directly in the panfrost_transparent_hugepage definition), > and I think I'd prefer if this change was done in a separate commit. Maybe I could do it in the commit where I move that module param's handling into panfrost_gem? > > > > 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_drv.h | 4 ++++ > > 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 ++------ > > 6 files changed, 32 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > > index 485349faf251..05c40d5a20b5 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > > @@ -280,9 +280,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: > > @@ -304,6 +309,7 @@ int panfrost_device_init(struct panfrost_device *pfdev) > > > > 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/panfrost/panfrost_drv.c > > index 96a66d673ba6..9882a3ede75f 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > > @@ -1003,14 +1003,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); > > @@ -1024,7 +1019,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_drv.h b/drivers/gpu/drm/panfrost/panfrost_drv.h > > index a2277ec61aab..bac0c415d4da 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_drv.h > > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.h > > @@ -4,6 +4,10 @@ > > #ifndef __PANFROST_DRV_H__ > > #define __PANFROST_DRV_H__ > > > > +#if IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) > > extern bool panfrost_transparent_hugepage; > > +#else > > +#define panfrost_transparent_hugepage false > > +#endif > > > > #endif > > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/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" > > > > -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; > > + if (panfrost_transparent_hugepage) { > > + 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); > > This can probably be turned into: > > if (err) > drm_warn(&pfdev->base, > "Can't use Transparent Hugepage (%d)\n", err); > else > drm_info(&pfdev->base, "Using Transparent Hugepage\n"); > > since there's no world where drm_gem_get_huge_mnt() would return NULL if > drm_gem_huge_mnt_create() returns 0 when CONFIG_TRANSPARENT_HUGEPAGE=y. > The pre-existing checks where there to cover CONFIG_TRANSPARENT_HUGEPAGE=n > which you already cover by not entering this branch. Will do, but also write this into the patch that moves the module param into panfrost_gem.c instead. > > + } > > > > - 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); > > +} > > + > > +void panfrost_gem_fini(struct panfrost_device *pfdev) > > +{ > > + panfrost_gem_shrinker_fini(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..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 *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); > > +void panfrost_gem_fini(struct panfrost_device *pfdev); > > > > struct drm_gem_object *panfrost_gem_create_object(struct drm_device *dev, size_t size); > > > > @@ -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 *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