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 BF99547D95F for ; Tue, 11 Aug 2026 21:43:18 +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=1786484600; cv=pass; b=oXD8A1/9aF6AXUX4SDeYyHqMOHRoCddBTuMnuLU3wYc0QQYOJPF2qGYVB7dyBpEIiqNuCOteS6H+V/a0ebBFvlN6DdidiZs1wrCNrqjP/e6T/Bkmj6QnnbppvCznjv6esDXfM4fxWVOxqGpfetYF2wr0Yg4/uBAu0cRJSdzum0Q= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786484600; c=relaxed/simple; bh=UFNiKZL/rzU1NBLU1fwmVnBxoqcD8qxLdv88oUCYWyU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bN9SSrMWSwHvdV8KHunXkEEsrWY6J0Pf5a8XY4ona2rD09GnZBoAxhf0arbdpLp3PFBbZBtIkULSvc6Dn4vHWZsDLVgI9rqWIAXD9TtkHhO/MZklf4n9ieoG73uRVEV1NBH2fh9QSJra/IGuBN/L8siK2kwatiR6q8Sp91Jydh4= 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=KhYxPWn6; 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="KhYxPWn6" ARC-Seal: i=1; a=rsa-sha256; t=1786484561; cv=none; d=zohomail.com; s=zohoarc; b=FxqMDw/uLLPR7kv8oeMaHOfFdizHabHSPxihij22IyQ49lSpp48sIoVanpjxTGI8bh0lQLZQCL4mP4yfdQMLuHq6IIOGyJY/eZsiov9TPov97+OwF9CyRe1MFdViEwsZgsiEDiXxywP2J7eFq1ShsZIetzxBM3V3H0DA8mWvd30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786484561; 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=QUIEoCo3QQ1cejoHsnfwMpGWp66qEkzkRNU1qvzQHUc=; b=f+PDsUs5hKiZPyZxJFTKiEjgKp0zuv8HpauXW/xfjTVbhbmnP+ZuoVYAQYKhQapVS+QLyaCi21/37RJwAjb/E7B8sdUbahOeVRc+h8E7JBgE5LiF0gGoErEIf2WoNX7o1RZpV7qbXl60PVDYCYwwCxNGmgTeTPqbCsxjvI2ALBg= 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=1786484561; 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=QUIEoCo3QQ1cejoHsnfwMpGWp66qEkzkRNU1qvzQHUc=; b=KhYxPWn6JKgVHIoL8MYocOIBB3CD+MpuNQli3A4xHXt/tW7uuKj7DAU0Tns1K67H BmWD1W7vjadvzn+OY7/JzNvjq/aDEAFYZztnOaUwTkUWLkzx8Za/Nk3l5QGmgi75QZ2 wwVyvry3lWacBY7nFrE90Umnoa2ZsDc+z8/4wW/g= Received: by mx.zohomail.com with SMTPS id 178648456017669.56998881685422; Tue, 11 Aug 2026 14:42:40 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= Date: Tue, 11 Aug 2026 22:42:13 +0100 Subject: [PATCH v5 04/11] 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: <20260811-claude-fixes-v5-4-3d692c9e98c2@collabora.com> References: <20260811-claude-fixes-v5-0-3d692c9e98c2@collabora.com> In-Reply-To: <20260811-claude-fixes-v5-0-3d692c9e98c2@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=6358; i=adrian.larumbe@collabora.com; h=from:subject:message-id; bh=UFNiKZL/rzU1NBLU1fwmVnBxoqcD8qxLdv88oUCYWyU=; b=owEB7QES/pANAwAKAQ4mfkzuU0M9AcsmYgBqe5czPNnwDJSJZND5NMu+fSDYNhgGW8AaIZ2fN VqqU78NkCSJAbMEAAEKAB0WIQQyQDDowAUXXfk3B6QOJn5M7lNDPQUCanuXMwAKCRAOJn5M7lND PfLCC/4na0YE7Avjd3p8lWWZX4frYokKP1Z9XWbAv6ZGFSOJxTKD1jLTr+skLVog2YxMX3i9HKC 9AomnzMcFLD1IkokXsng+tKrEVm8W8vs7M+Maduo0IGFHI47X3QyZMVYEgi0n9DKINCon3RUNqD M+TPoTSFFzOno4rMXiE1ndqPA9aL+U87gN+j00eB/k0tWn6yWxkrojOe4SXyVFMb+RGulIw0Rah bLUz+DJrlsTKLP8I9kEUz2dV9yFci1rUH4F0NnvQqI33BoMHBwyvpyi7aHrXm61AeXS5WqVT8wQ b13dmmBkQAGUYJGd0+yWxfoBNZbg7gTIsbiEfhLz1lWi/su1P4w/YtgPkYMKm1jHIwDqf2B8RrX 3dHREwxZG4vOv/9IPzwCkN7MTpo+rtMy/OK4XJJfGZuTZMOmDs+r6O1c6+OM9fffo04WbM9nBwK ZyHV6SYjUxZ/eniNKeIJgTD0MqTqAgemZzoye0SwPz2k1grPIlP+T4ON/i/kKRlajL5/s= 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_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(-) 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 *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_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..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