From: Boris Brezillon <boris.brezillon@collabora.com>
To: Karunika Choo <karunika.choo@arm.com>
Cc: dri-devel@lists.freedesktop.org, nd@arm.com,
Steven Price <steven.price@arm.com>,
Liviu Dudau <liviu.dudau@arm.com>,
linux-kernel@vger.kernel.org, Akash Goel <akash.goel@arm.com>,
Lukas Zapolskas <lukas.zapolskas@arm.com>,
Chris Diamand <chris.diamand@arm.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>
Subject: Re: [PATCH v3 04/10] drm/panthor: Parse and store GPU_ID fields
Date: Thu, 19 Nov 2026 08:53:56 +0100 [thread overview]
Message-ID: <20261119085356.42a7cb13@fedora1.home> (raw)
In-Reply-To: <20261118175332.519657-5-karunika.choo@arm.com>
On Wed, 18 Nov 2026 17:53:20 +0000
Karunika Choo <karunika.choo@arm.com> wrote:
> Prepare for Mali v15, where GPU_ID expands to 64 bits and its field
> layout changes.
>
> Introduce a small panthor_gpu_id structure and parse the GPU_ID fields
> once during hardware initialization. Convert existing users to consume
> the cached fields instead of extracting them repeatedly from the raw
> register value.
>
> This centralizes GPU_ID decoding and makes it easier to support both the
> existing and v15 formats.
>
> Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
> Signed-off-by: Karunika Choo <karunika.choo@arm.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
> v2:
> - Picked up R-b from Liviu
> - Avoid modifying the printed id field for existing GPUs.
> - Link: https://lore.kernel.org/all/20260922205659.3C4F21F000FF@smtp.kernel.org/
> v1:
> - changed struct panthor_gpu_id into a flat structure instead of
> inconsistent groupings.
>
> drivers/gpu/drm/panthor/panthor_device.h | 29 ++++++++++++++++++++++++
> drivers/gpu/drm/panthor/panthor_fw.c | 4 ++--
> drivers/gpu/drm/panthor/panthor_gpu.c | 2 +-
> drivers/gpu/drm/panthor/panthor_hw.c | 24 ++++++++++++++------
> drivers/gpu/drm/panthor/panthor_hw.h | 4 ++--
> 5 files changed, 51 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h
> index 4add31b12cfd7..f0a96ff0f13da 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.h
> +++ b/drivers/gpu/drm/panthor/panthor_device.h
> @@ -111,6 +111,32 @@ struct panthor_irq {
> enum panthor_irq_state state;
> };
>
> +/**
> + * struct panthor_gpu_id - Parsed GPU_ID fields
> + */
> +struct panthor_gpu_id {
> + /** @arch_major: Architecture major revision */
> + u8 arch_major;
> +
> + /** @arch_minor: Architecture minor revision */
> + u8 arch_minor;
> +
> + /** @arch_rev: Architecture patch revision */
> + u8 arch_rev;
> +
> + /** @prod_major: Product identifier */
> + u8 prod_major;
> +
> + /** @ver_major: Major release version number */
> + u8 ver_major;
> +
> + /** @ver_minor: Minor release version number */
> + u8 ver_minor;
> +
> + /** @ver_status: Status of GPU release */
> + u8 ver_status;
> +};
> +
> /**
> * enum panthor_device_profiling_mode - Profiling state
> */
> @@ -170,6 +196,9 @@ struct panthor_device {
> /** @mmu_info: MMU info */
> struct drm_panthor_mmu_info mmu_info;
>
> + /** @gpu_id: Parsed GPU_ID fields */
> + struct panthor_gpu_id gpu_id;
> +
> /** @hw: GPU-specific data. */
> struct panthor_hw *hw;
>
> diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c
> index 4f1fab66a13bf..13efed3a2ea72 100644
> --- a/drivers/gpu/drm/panthor/panthor_fw.c
> +++ b/drivers/gpu/drm/panthor/panthor_fw.c
> @@ -809,8 +809,8 @@ static int panthor_fw_load(struct panthor_device *ptdev)
> int ret;
>
> snprintf(fw_path, sizeof(fw_path), "arm/mali/arch%d.%d/%s",
> - (u32)GPU_ARCH_MAJOR(ptdev->gpu_info.gpu_id),
> - (u32)GPU_ARCH_MINOR(ptdev->gpu_info.gpu_id),
> + (u32)ptdev->gpu_id.arch_major,
> + (u32)ptdev->gpu_id.arch_minor,
> CSF_FW_NAME);
>
> ret = request_firmware(&fw, fw_path, ptdev->base.dev);
> diff --git a/drivers/gpu/drm/panthor/panthor_gpu.c b/drivers/gpu/drm/panthor/panthor_gpu.c
> index b8df5663f04e4..c5c37f22993d6 100644
> --- a/drivers/gpu/drm/panthor/panthor_gpu.c
> +++ b/drivers/gpu/drm/panthor/panthor_gpu.c
> @@ -74,7 +74,7 @@ static void panthor_gpu_l2_config_set(struct panthor_device *ptdev)
> if (!data || !data->asn_hash_enable)
> return;
>
> - if (GPU_ARCH_MAJOR(ptdev->gpu_info.gpu_id) < 11) {
> + if (ptdev->gpu_id.arch_major < 11) {
> drm_err(&ptdev->base, "Custom ASN hash not supported by the device");
> return;
> }
> diff --git a/drivers/gpu/drm/panthor/panthor_hw.c b/drivers/gpu/drm/panthor/panthor_hw.c
> index 34dc4b9d9dc09..854874a9f322a 100644
> --- a/drivers/gpu/drm/panthor/panthor_hw.c
> +++ b/drivers/gpu/drm/panthor/panthor_hw.c
> @@ -119,9 +119,9 @@ void panthor_hw_power_status_unregister(void)
>
> static char *get_gpu_model_name(struct panthor_device *ptdev)
> {
> - const u32 gpu_id = ptdev->gpu_info.gpu_id;
> - const u32 product_id = GPU_PROD_ID_MAKE(GPU_ARCH_MAJOR(gpu_id),
> - GPU_PROD_MAJOR(gpu_id));
> + const struct panthor_gpu_id *gpu_id = &ptdev->gpu_id;
> + const u32 product_id = GPU_PROD_ID_MAKE(gpu_id->arch_major,
> + gpu_id->prod_major);
> const bool ray_intersection = !!(ptdev->gpu_info.gpu_features &
> GPU_FEATURES_RAY_INTERSECTION);
> const u8 shader_core_count = hweight64(ptdev->gpu_info.shader_present);
> @@ -245,9 +245,9 @@ static int panthor_hw_info_init(struct panthor_device *ptdev)
> if (ret)
> return ret;
>
> - major = GPU_VER_MAJOR(ptdev->gpu_info.gpu_id);
> - minor = GPU_VER_MINOR(ptdev->gpu_info.gpu_id);
> - status = GPU_VER_STATUS(ptdev->gpu_info.gpu_id);
> + major = ptdev->gpu_id.ver_major;
> + minor = ptdev->gpu_id.ver_minor;
> + status = ptdev->gpu_id.ver_status;
>
> drm_info(&ptdev->base,
> "%s id 0x%x major 0x%x minor 0x%x status 0x%x",
> @@ -273,7 +273,7 @@ static int panthor_hw_info_init(struct panthor_device *ptdev)
> static int panthor_hw_bind_device(struct panthor_device *ptdev)
> {
> struct panthor_hw *hdev = NULL;
> - const u32 arch_major = GPU_ARCH_MAJOR(ptdev->gpu_info.gpu_id);
> + const u32 arch_major = ptdev->gpu_id.arch_major;
> int i = 0;
>
> for (i = 0; i < ARRAY_SIZE(panthor_hw_match); i++) {
> @@ -295,10 +295,20 @@ static int panthor_hw_bind_device(struct panthor_device *ptdev)
>
> static int panthor_hw_gpu_id_init(struct panthor_device *ptdev)
> {
> + struct panthor_gpu_id *gpu_id = &ptdev->gpu_id;
> ptdev->gpu_info.gpu_id = gpu_read(ptdev->iomem, GPU_ID);
> +
> if (!ptdev->gpu_info.gpu_id)
> return -ENXIO;
>
> + gpu_id->arch_major = GPU_ARCH_MAJOR(ptdev->gpu_info.gpu_id);
> + gpu_id->arch_minor = GPU_ARCH_MINOR(ptdev->gpu_info.gpu_id);
> + gpu_id->arch_rev = GPU_ARCH_REV(ptdev->gpu_info.gpu_id);
> + gpu_id->prod_major = GPU_PROD_MAJOR(ptdev->gpu_info.gpu_id);
> + gpu_id->ver_major = GPU_VER_MAJOR(ptdev->gpu_info.gpu_id);
> + gpu_id->ver_minor = GPU_VER_MINOR(ptdev->gpu_info.gpu_id);
> + gpu_id->ver_status = GPU_VER_STATUS(ptdev->gpu_info.gpu_id);
> +
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/panthor/panthor_hw.h b/drivers/gpu/drm/panthor/panthor_hw.h
> index f770dc40e6216..c4a490bc39de6 100644
> --- a/drivers/gpu/drm/panthor/panthor_hw.h
> +++ b/drivers/gpu/drm/panthor/panthor_hw.h
> @@ -58,12 +58,12 @@ static inline void panthor_hw_l2_power_off(struct panthor_device *ptdev)
>
> static inline bool panthor_hw_has_pwr_ctrl(struct panthor_device *ptdev)
> {
> - return GPU_ARCH_MAJOR(ptdev->gpu_info.gpu_id) >= 14;
> + return ptdev->gpu_id.arch_major >= 14;
> }
>
> static inline bool panthor_hw_has_neural(struct panthor_device *ptdev)
> {
> - return (GPU_ARCH_MAJOR(ptdev->gpu_info.gpu_id) >= 14 &&
> + return (ptdev->gpu_id.arch_major >= 14 &&
> ptdev->gpu_info.gpu_features & GPU_FEATURES_NX);
> }
>
next prev parent reply other threads:[~2026-11-19 7:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 17:53 [PATCH v3 00/10] drm/panthor: Add initial Mali v15 support Karunika Choo
2026-11-18 17:53 ` [PATCH v3 01/10] drm/panthor: Ignore -EOPNOTSUPP for shader-present nvmem lookup Karunika Choo
2026-11-18 17:53 ` [PATCH v3 02/10] drm/panthor: Rename neural accelerator feature macro to NX Karunika Choo
2026-11-18 17:59 ` sashiko-bot
2026-11-19 7:52 ` Boris Brezillon
2026-11-19 9:47 ` Liviu Dudau
2026-11-18 17:53 ` [PATCH v3 03/10] drm/panthor: Move register access helpers out of panthor_device.h Karunika Choo
2026-11-19 7:53 ` Boris Brezillon
2026-11-18 17:53 ` [PATCH v3 04/10] drm/panthor: Parse and store GPU_ID fields Karunika Choo
2026-11-19 7:53 ` Boris Brezillon [this message]
2026-11-18 17:53 ` [PATCH v3 05/10] drm/panthor: Add 64-bit GPU_ID decoding for v15 GPUs Karunika Choo
2026-11-19 8:01 ` Boris Brezillon
2026-11-18 17:53 ` [PATCH v3 06/10] drm/panthor: Move register base offsets to the HW description Karunika Choo
2026-11-19 8:01 ` Boris Brezillon
2026-11-18 17:53 ` [PATCH v3 07/10] drm/panthor: Derive MMU AS register addresses from base and stride Karunika Choo
2026-11-19 8:03 ` Boris Brezillon
2026-11-18 17:53 ` [PATCH v3 08/10] dt-bindings: gpu: mali-gen5-am: Add Mali 5th-Gen AM schema Karunika Choo
2026-11-19 8:04 ` Boris Brezillon
2026-11-18 17:53 ` [PATCH v3 09/10] drm/panthor: Add Mali v15 hardware support Karunika Choo
2026-11-19 8:08 ` Boris Brezillon
2026-11-18 17:53 ` [PATCH v3 10/10] drm/panthor: Skip devfreq when no OPP table is present Karunika Choo
2026-11-18 18:11 ` sashiko-bot
2026-11-19 8:12 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119085356.42a7cb13@fedora1.home \
--to=boris.brezillon@collabora.com \
--cc=airlied@gmail.com \
--cc=akash.goel@arm.com \
--cc=chris.diamand@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=karunika.choo@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=lukas.zapolskas@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nd@arm.com \
--cc=simona@ffwll.ch \
--cc=steven.price@arm.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.