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 8BBB83BD63D for ; Fri, 28 Aug 2026 20:58:14 +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=1787950696; cv=pass; b=lP2Gg8NszqIowI+cim2pvk+ThTiyOtMIdePLTi74i5/2AD1j92RS+yMJKos4OdO6hBQo5lGArSp2S2tY+k34w3jCxd3dYj4vST1XbdM14z4ep0vRqgzyxMvSq0Pmn+SNXPgzXiS5atPfE0LIgjq11sMNYzUOm8FuJB6r45XBONc= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787950696; c=relaxed/simple; bh=6xeWEUHEJGkLLAje31aRC5tjM099PLVWz/R1vWcPi3w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qNcdVAaG9ZN3x+8Kszx2ZfBM/XWGr4UXQgBqWne9N50q5omNY9RJp4bY/pgbScJVH+PCCxfeNWNQInyMhhwcpH4GlOEjk3Ie2LYzi4j+533RLu1dSp4NtYHQQQ/CmU324HuflU/06ZCYd/CIS+SNfv2QUZYxXYbCOc5xjA1cumo= 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=jyVvxazg; 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="jyVvxazg" ARC-Seal: i=1; a=rsa-sha256; t=1787950650; cv=none; d=zohomail.com; s=zohoarc; b=eKuMR0XNe8Ipg1ts2EBUAsTh0imaqstONDMiruGWqNPG1F/Qajn6LQ+/F0/CYRJ687ivKLNF9HncQ+eaA6qXAzXmeJRipubZqQThIrC7mGIN1ux5kSIipn2C19Y71z6GIIjPgXJb4riRmMHoGxIAJO74KM5Ea6Ay3Kn3B+fLbDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787950650; 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=LXKblu75Wmd4ijGN4q4BnsvjxrwQ4Xm93VsF4qtkNUA=; b=al8aJwU+L9O8IYKz3b7NPtdPPD/f0T7MYPrV4DXo3ID9emV5S1Pc0yn05fpPHvfXyuMcb6Pw2rqO6E2rAo7qx/TkudlTGsRDQ3jsXJpxelfJEOLiIkTfQ0y4LhHD/3bwLYy7M2Zwh8ICb2Hy6TGzU363T7sHsjZZGlfbdJDpnKQ= 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=1787950650; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=LXKblu75Wmd4ijGN4q4BnsvjxrwQ4Xm93VsF4qtkNUA=; b=jyVvxazgSzVFXfLVAxejETsd1emWpGTvx3JsxvaGZ29PBrf3CpovxxJLhWXKCnT1 lkOdUWboSy65zHu/dfILCeNXjywKtejFcTkOJ5DyuTVc981JvroPQkQZ2cWTvB2B4u5 B2DHC+kEiv9X1FvfFe8t5uIpdrIACmKEXoP2DaYQ= Received: by mx.zohomail.com with SMTPS id 1787950649363117.59067190316011; Fri, 28 Aug 2026 13:57:29 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= Date: Fri, 28 Aug 2026 21:56:41 +0100 Subject: [PATCH v7 01/17] drm/panfrost: Move shrinker initialization and unplug one level down 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-Transfer-Encoding: 8bit Message-Id: <20260828-claude-fixes-v7-1-72a13b2c125d@collabora.com> References: <20260828-claude-fixes-v7-0-72a13b2c125d@collabora.com> In-Reply-To: <20260828-claude-fixes-v7-0-72a13b2c125d@collabora.com> To: Boris Brezillon , 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 Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Collabora Kernel Team , =?utf-8?q?Adri=C3=A1n_Larumbe?= , Neil Armstrong X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6895; i=adrian.larumbe@collabora.com; h=from:subject:message-id; bh=6xeWEUHEJGkLLAje31aRC5tjM099PLVWz/R1vWcPi3w=; b=owEB7QES/pANAwAKAQ4mfkzuU0M9AcsmYgBqkfYsfnTzvm9jo16anBEMWpJNK4/0EYk09WyWp mn0naboU++JAbMEAAEKAB0WIQQyQDDowAUXXfk3B6QOJn5M7lNDPQUCapH2LAAKCRAOJn5M7lND PYONC/4k9kIF+7RtF9a56t2tZgQNa+SqQBrb12KyuPcx7ppVrGeF8mZ3fXTBJWttlIm+805Ks2p l2YYchz8o55YeDELlATn2uVSa1f+BkW61QjWl/OkyYKAKqkmS98t/5bKfOYctHvj6TXPlLuxzj2 PXTd6S6+oXoN2kpfMgmrIDEBNt/3VQ+SN8BKQ4UGpzV2wze67OH9HZfyWR77+D8LMIE+FE6bPQ5 1sbSDFGhrhQd/u3xhMiHx2Y+zGB8WiuSUPIxQ3QALEcHf1Fl6XZ5/HEXL2pjbKKCNYFgZ4OYt16 wtZuD8EURIxoLN/I0HHda2onwieZwqZjVfzY5dspUM7JcgHJP4iqs7MWdQM3KX8Pvo0OwdhQAED 4VLid7bA0UnxAU+Z5AQOey1nP6SfIVohKg8GVI8veL7RRGZzppf4t12MbF2OviZ/uNVrYeuDoGe OKH/gnjjLVrtatPjM9O/IfRk84sbPfU8fCtZTDvrN0kvjYTUOR54ghyykWpS/M6RuPnAo= X-Developer-Key: i=adrian.larumbe@collabora.com; a=openpgp; fpr=324030E8C005175DF93707A40E267E4CEE53433D 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. 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); + } - 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); } -- 2.55.0