From nobody Fri Dec 19 21:51:02 2025 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 537D0D26B; Wed, 6 Mar 2024 01:58:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709690311; cv=none; b=CefzwZ1ZugTCttTIEo9odFTWH0xTwb1BGjEJLjmjG4FuBpLp9p60CgWP9n423Vm0Cr9VBa6lcgU4F22AqtTJ76ChsFpZY/iXdvCyQQu4Ju5bTWwR79/htTl5dS9fYySURseOsE9WP2r8ziNDF7M71kOIrDq16bMhBlzgTY/qsbs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709690311; c=relaxed/simple; bh=5rE0UzIqG/TgQuHQBk0s7Cli9GVhBHPra6IpsjHEOAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qoiyuRXMw73jUp8/XH+L99JgEgiFnRlIDoF09zmd3KThM9oe2KB6u+bYVMl/4bKAy8mvUmRpSw+NY6jH8OBiVidmSM86WzD8eGUkRgwkoSglzIjUopgA2XxVVXX9s12hPvg5G6HvG6jcnVwMaSfd5c2BITw8bghGq6AkD0gDDLY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=gtkD4Yg8; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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 (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="gtkD4Yg8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1709690307; bh=5rE0UzIqG/TgQuHQBk0s7Cli9GVhBHPra6IpsjHEOAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gtkD4Yg8/Zl9njf3BiUYTmU3NvQuba8U246DN7LqoChFvxiHwlDnrfDpIIuDZUzEt NUhlKj2qWQ4rnD3WSLWBGGoN9XtpMEJkGi2GeiDzfqlgbQbqOjZHtxaYi1Yym3YrkV tNR/E3pzDXLbSQE4cpgCc0jMwhbDFKeh24HSJlPCZgkbAymmxB5dKX/8+GYjCIDBkD exwVibTjP0CgWV9nDn+XVBYqXoAoMKeGOhkOB+hrFR8x+bMwXKLXA478nTRPkiBBrg JPRuHtEgxDKRoDa36wWFRQN/gsvRGGJIPYFdiCzu8JOVzFD/1c8MpzvxQlm8/9xssR SqZVzioYpQ8gA== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: alarumbe) by madrid.collaboradmins.com (Postfix) with ESMTPSA id BBA7B37820BB; Wed, 6 Mar 2024 01:58:26 +0000 (UTC) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: boris.brezillon@collabora.com, robh@kernel.org, steven.price@arm.com, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, corbet@lwn.net Cc: kernel@collabora.com, adrian.larumbe@collabora.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org Subject: [PATCH v3 1/1] drm/panfrost: Replace fdinfo's profiling debugfs knob with sysfs Date: Wed, 6 Mar 2024 01:56:36 +0000 Message-ID: <20240306015819.822128-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306015819.822128-1-adrian.larumbe@collabora.com> References: <20240306015819.822128-1-adrian.larumbe@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-Transfer-Encoding: quoted-printable Debugfs isn't always available in production builds that try to squeeze every single byte out of the kernel image, but we still need a way to toggle the timestamp and cycle counter registers so that jobs can be profiled for fdinfo's drm engine and cycle calculations. Drop the debugfs knob and replace it with a sysfs file that accomplishes the same functionality, and document its ABI in a separate file. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon Reviewed-by: Steven Price --- .../testing/sysfs-driver-panfrost-profiling | 10 +++++ Documentation/gpu/panfrost.rst | 9 ++++ drivers/gpu/drm/panfrost/Makefile | 2 - drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 ---------- drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 ------- drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 41 ++++++++++++++++--- drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- 8 files changed, 57 insertions(+), 44 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-panfrost-profili= ng delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h diff --git a/Documentation/ABI/testing/sysfs-driver-panfrost-profiling b/Do= cumentation/ABI/testing/sysfs-driver-panfrost-profiling new file mode 100644 index 000000000000..1d8bb0978920 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-driver-panfrost-profiling @@ -0,0 +1,10 @@ +What: /sys/bus/platform/drivers/panfrost/.../profiling +Date: February 2024 +KernelVersion: 6.8.0 +Contact: Adrian Larumbe +Description: + Get/set drm fdinfo's engine and cycles profiling status. + Valid values are: + 0: Don't enable fdinfo job profiling sources. + 1: Enable fdinfo job profiling sources, this enables both the GPU's + timestamp and cycle counter registers. \ No newline at end of file diff --git a/Documentation/gpu/panfrost.rst b/Documentation/gpu/panfrost.rst index b80e41f4b2c5..51ba375fd80d 100644 --- a/Documentation/gpu/panfrost.rst +++ b/Documentation/gpu/panfrost.rst @@ -38,3 +38,12 @@ the currently possible format options: =20 Possible `drm-engine-` key names are: `fragment`, and `vertex-tiler`. `drm-curfreq-` values convey the current operating frequency for that engi= ne. + +Users must bear in mind that engine and cycle sampling are disabled by def= ault, +because of power saving concerns. `fdinfo` users and benchmark application= s which +query the fdinfo file must make sure to toggle the job profiling status of= the +driver by writing into the appropriate sysfs node:: + + echo > /sys/bus/platform/drivers/panfrost/[a-f0-9]*.gpu/profiling + +Where `N` is either `0` or `1`, depending on the desired enablement status. diff --git a/drivers/gpu/drm/panfrost/Makefile b/drivers/gpu/drm/panfrost/M= akefile index 2c01c1e7523e..7da2b3f02ed9 100644 --- a/drivers/gpu/drm/panfrost/Makefile +++ b/drivers/gpu/drm/panfrost/Makefile @@ -12,6 +12,4 @@ panfrost-y :=3D \ panfrost_perfcnt.o \ panfrost_dump.o =20 -panfrost-$(CONFIG_DEBUG_FS) +=3D panfrost_debugfs.o - obj-$(CONFIG_DRM_PANFROST) +=3D panfrost.o diff --git a/drivers/gpu/drm/panfrost/panfrost_debugfs.c b/drivers/gpu/drm/= panfrost/panfrost_debugfs.c deleted file mode 100644 index 72d4286a6bf7..000000000000 --- a/drivers/gpu/drm/panfrost/panfrost_debugfs.c +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright 2023 Collabora ltd. */ -/* Copyright 2023 Amazon.com, Inc. or its affiliates. */ - -#include -#include -#include -#include -#include - -#include "panfrost_device.h" -#include "panfrost_gpu.h" -#include "panfrost_debugfs.h" - -void panfrost_debugfs_init(struct drm_minor *minor) -{ - struct drm_device *dev =3D minor->dev; - struct panfrost_device *pfdev =3D platform_get_drvdata(to_platform_device= (dev->dev)); - - debugfs_create_atomic_t("profile", 0600, minor->debugfs_root, &pfdev->pro= file_mode); -} diff --git a/drivers/gpu/drm/panfrost/panfrost_debugfs.h b/drivers/gpu/drm/= panfrost/panfrost_debugfs.h deleted file mode 100644 index c5af5f35877f..000000000000 --- a/drivers/gpu/drm/panfrost/panfrost_debugfs.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright 2023 Collabora ltd. - * Copyright 2023 Amazon.com, Inc. or its affiliates. - */ - -#ifndef PANFROST_DEBUGFS_H -#define PANFROST_DEBUGFS_H - -#ifdef CONFIG_DEBUG_FS -void panfrost_debugfs_init(struct drm_minor *minor); -#endif - -#endif /* PANFROST_DEBUGFS_H */ diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/p= anfrost/panfrost_device.h index 62f7e3527385..cffcb0ac7c11 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -130,7 +130,7 @@ struct panfrost_device { struct list_head scheduled_jobs; =20 struct panfrost_perfcnt *perfcnt; - atomic_t profile_mode; + bool profile_mode; =20 struct mutex sched_lock; =20 diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panf= rost/panfrost_drv.c index a926d71e8131..9696702800a4 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -20,7 +20,6 @@ #include "panfrost_job.h" #include "panfrost_gpu.h" #include "panfrost_perfcnt.h" -#include "panfrost_debugfs.h" =20 static bool unstable_ioctls; module_param_unsafe(unstable_ioctls, bool, 0600); @@ -600,10 +599,6 @@ static const struct drm_driver panfrost_drm_driver =3D= { =20 .gem_create_object =3D panfrost_gem_create_object, .gem_prime_import_sg_table =3D panfrost_gem_prime_import_sg_table, - -#ifdef CONFIG_DEBUG_FS - .debugfs_init =3D panfrost_debugfs_init, -#endif }; =20 static int panfrost_probe(struct platform_device *pdev) @@ -692,6 +687,41 @@ static void panfrost_remove(struct platform_device *pd= ev) drm_dev_put(ddev); } =20 +static ssize_t profiling_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct panfrost_device *pfdev =3D dev_get_drvdata(dev); + + return sysfs_emit(buf, "%d\n", pfdev->profile_mode); +} + + +static ssize_t profiling_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct panfrost_device *pfdev =3D dev_get_drvdata(dev); + bool value; + int err; + + err =3D kstrtobool(buf, &value); + if (err) + return err; + + pfdev->profile_mode =3D value; + + return len; +} + +static DEVICE_ATTR_RW(profiling); + +static struct attribute *panfrost_attrs[] =3D { + &dev_attr_profiling.attr, + NULL, +}; + +ATTRIBUTE_GROUPS(panfrost); + /* * The OPP core wants the supply names to be NULL terminated, but we need = the * correct num_supplies value for regulator core. Hence, we NULL terminate= here @@ -789,6 +819,7 @@ static struct platform_driver panfrost_driver =3D { .name =3D "panfrost", .pm =3D pm_ptr(&panfrost_pm_ops), .of_match_table =3D dt_match, + .dev_groups =3D panfrost_groups, }, }; module_platform_driver(panfrost_driver); diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index 0c2dbf6ef2a5..a61ef0af9a4e 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -243,7 +243,7 @@ static void panfrost_job_hw_submit(struct panfrost_job = *job, int js) subslot =3D panfrost_enqueue_job(pfdev, js, job); /* Don't queue the job if a reset is in progress */ if (!atomic_read(&pfdev->reset.pending)) { - if (atomic_read(&pfdev->profile_mode)) { + if (pfdev->profile_mode) { panfrost_cycle_counter_get(pfdev); job->is_profiled =3D true; job->start_time =3D ktime_get(); --=20 2.43.0