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>,
Daniel Almeida <daniel.almeida@collabora.com>,
Alice Ryhl <aliceryhl@google.com>,
rust-for-linux@vger.kernel.org
Subject: Re: [PATCH v3 05/10] drm/panthor: Add 64-bit GPU_ID decoding for v15 GPUs
Date: Thu, 19 Nov 2026 09:01:18 +0100 [thread overview]
Message-ID: <20261119090118.7cfc417b@fedora1.home> (raw)
In-Reply-To: <20261118175332.519657-6-karunika.choo@arm.com>
On Wed, 18 Nov 2026 17:53:21 +0000
Karunika Choo <karunika.choo@arm.com> wrote:
> Mali v15 exposes a 64-bit GPU_ID register with a different field layout
> from earlier GPUs.
>
> Add the register definitions and decoding helpers for the new format,
> read GPU_ID_WIDE when the compatibility value indicates a v15 GPU, and
> populate both the cached GPU_ID fields and the uAPI gpu_id_wide field.
>
> This allows userspace and the driver to identify v15 GPUs correctly.
>
> 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>
> ---
> v3:
> - Fix the missing blank line after declarations in GPU_ID decoding.
> v2:
> - Picked up R-b from Liviu.
> - Rename the register macro from GPU_WIDE_ID to GPU_ID_WIDE.
> - Rename the uAPI field from gpu_wide_id to gpu_id_wide.
> - Print the upper 32 bits of GPU_ID_WIDE as the logged 'id' for v15 and
> later GPUs. Keep the existing output for earlier GPUs. Continuation
> fix for previous sashiko comment.
> - Link: https://lore.kernel.org/all/20260922205659.3C4F21F000FF@smtp.kernel.org/
> v1:
> - Decode selected GPU_ID format after checking compatibility value.
> - Document GPU_DISCOVER and GPU_CONTROL register offset differences
> between GPUs.
> - Fix mask generation in panthor_gpu_discover_regs.h
>
> .../drm/panthor/panthor_gpu_discover_regs.h | 19 ++++++
> drivers/gpu/drm/panthor/panthor_hw.c | 63 ++++++++++++++-----
> include/uapi/drm/panthor_drm.h | 13 ++++
> 3 files changed, 81 insertions(+), 14 deletions(-)
> create mode 100644 drivers/gpu/drm/panthor/panthor_gpu_discover_regs.h
>
> diff --git a/drivers/gpu/drm/panthor/panthor_gpu_discover_regs.h b/drivers/gpu/drm/panthor/panthor_gpu_discover_regs.h
> new file mode 100644
> index 0000000000000..6896c263f76b6
> --- /dev/null
> +++ b/drivers/gpu/drm/panthor/panthor_gpu_discover_regs.h
> @@ -0,0 +1,19 @@
> +/* SPDX-License-Identifier: GPL-2.0 or MIT */
> +/* Copyright 2026 ARM Limited. All rights reserved. */
> +
> +#ifndef __PANTHOR_GPU_DISCOVER_REGS_H__
> +#define __PANTHOR_GPU_DISCOVER_REGS_H__
> +
> +#include <linux/bits.h>
> +
> +#define GPU_ID_WIDE 0x0
> +#define GPU_WIDE_COMPAT 0xF
> +#define GPU_WIDE_ARCH_MAJOR(x) (((x) & GENMASK_U64(63, 56)) >> 56)
> +#define GPU_WIDE_ARCH_MINOR(x) (((x) & GENMASK_U64(55, 48)) >> 48)
> +#define GPU_WIDE_ARCH_REV(x) (((x) & GENMASK_U64(47, 40)) >> 40)
> +#define GPU_WIDE_PROD_MAJOR(x) (((x) & GENMASK_U64(39, 32)) >> 32)
> +#define GPU_WIDE_VER_MAJOR(x) (((x) & GENMASK_U64(23, 16)) >> 16)
> +#define GPU_WIDE_VER_MINOR(x) (((x) & GENMASK_U64(15, 8)) >> 8)
> +#define GPU_WIDE_VER_STATUS(x) ((x) & GENMASK_U64(7, 0))
> +
> +#endif /* __PANTHOR_GPU_DISCOVER_REGS_H__ */
> diff --git a/drivers/gpu/drm/panthor/panthor_hw.c b/drivers/gpu/drm/panthor/panthor_hw.c
> index 854874a9f322a..a26fe42e14f78 100644
> --- a/drivers/gpu/drm/panthor/panthor_hw.c
> +++ b/drivers/gpu/drm/panthor/panthor_hw.c
> @@ -3,11 +3,13 @@
>
> #include <linux/nvmem-consumer.h>
> #include <linux/platform_device.h>
> +#include <linux/wordpart.h>
>
> #include <drm/drm_print.h>
>
> #include "panthor_device.h"
> #include "panthor_gpu.h"
> +#include "panthor_gpu_discover_regs.h"
> #include "panthor_gpu_regs.h"
> #include "panthor_hw.h"
> #include "panthor_pwr.h"
> @@ -238,21 +240,30 @@ static int panthor_gpu_info_init(struct panthor_device *ptdev)
>
> static int panthor_hw_info_init(struct panthor_device *ptdev)
> {
> - u32 major, minor, status;
> + u32 prod_id, major, minor, status;
> int ret;
>
> ret = panthor_gpu_info_init(ptdev);
> if (ret)
> return ret;
>
> + /*
> + * The logged 'id' contains four 4-bit architecture and product fields
> + * in pre-v15 GPUs. In v15+ GPUs, this is now four 8-bit fields.
> + * Preserve the pre-v15 format for compatibility. Tools decoding these
> + * fields must handle the wider format for v15+ GPUs.
> + */
> + if (ptdev->gpu_id.arch_major < 15)
> + prod_id = upper_16_bits(ptdev->gpu_info.gpu_id);
> + else
> + prod_id = upper_32_bits(ptdev->gpu_info.gpu_id_wide);
> +
> 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",
> - get_gpu_model_name(ptdev), ptdev->gpu_info.gpu_id >> 16,
> - major, minor, status);
> + drm_info(&ptdev->base, "%s id 0x%x major 0x%x minor 0x%x status 0x%x",
> + get_gpu_model_name(ptdev), prod_id, major, minor, status);
>
> drm_info(&ptdev->base,
> "Features: L2:%#x Tiler:%#x Mem:%#x MMU:%#x AS:%#x",
> @@ -296,18 +307,42 @@ 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);
> + u32 gpu_id32 = gpu_read(ptdev->iomem, GPU_ID);
>
> - if (!ptdev->gpu_info.gpu_id)
> + if (!gpu_id32)
> 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);
> + if (GPU_ARCH_MAJOR(gpu_id32) == GPU_WIDE_COMPAT) {
> + /*
> + * GPU_DISCOVER register block always starts at offset zero,
> + * so does the GPU_CONTROL register block on pre-v15 GPUs.
> + */
> + void __iomem *discover = ptdev->iomem;
> + u64 gpu_id64 = gpu_read64(discover, GPU_ID_WIDE);
> +
> + if (!gpu_id64)
> + return -ENXIO;
> +
> + ptdev->gpu_info.gpu_id_wide = gpu_id64;
> +
> + gpu_id->arch_major = GPU_WIDE_ARCH_MAJOR(gpu_id64);
> + gpu_id->arch_minor = GPU_WIDE_ARCH_MINOR(gpu_id64);
> + gpu_id->arch_rev = GPU_WIDE_ARCH_REV(gpu_id64);
> + gpu_id->prod_major = GPU_WIDE_PROD_MAJOR(gpu_id64);
> + gpu_id->ver_major = GPU_WIDE_VER_MAJOR(gpu_id64);
> + gpu_id->ver_minor = GPU_WIDE_VER_MINOR(gpu_id64);
> + gpu_id->ver_status = GPU_WIDE_VER_STATUS(gpu_id64);
> + } else {
> + ptdev->gpu_info.gpu_id = gpu_id32;
> +
> + gpu_id->arch_major = GPU_ARCH_MAJOR(gpu_id32);
> + gpu_id->arch_minor = GPU_ARCH_MINOR(gpu_id32);
> + gpu_id->arch_rev = GPU_ARCH_REV(gpu_id32);
> + gpu_id->prod_major = GPU_PROD_MAJOR(gpu_id32);
> + gpu_id->ver_major = GPU_VER_MAJOR(gpu_id32);
> + gpu_id->ver_minor = GPU_VER_MINOR(gpu_id32);
> + gpu_id->ver_status = GPU_VER_STATUS(gpu_id32);
> + }
>
> return 0;
> }
> diff --git a/include/uapi/drm/panthor_drm.h b/include/uapi/drm/panthor_drm.h
> index a2ff0f4ec6915..09b7f7931e4f4 100644
> --- a/include/uapi/drm/panthor_drm.h
> +++ b/include/uapi/drm/panthor_drm.h
> @@ -376,6 +376,19 @@ struct drm_panthor_gpu_info {
>
> /** @gpu_features: Bitmask describing supported GPU-wide features */
> __u64 gpu_features;
> +
> + /**
> + * @gpu_id_wide: 64-bit GPU ID for v15 and later GPUs. @gpu_id is 0 when
> + * this is populated.
> + */
> + __u64 gpu_id_wide;
> +#define DRM_PANTHOR_WIDE_ARCH_MAJOR(x) (((x) >> 56) & 0xff)
> +#define DRM_PANTHOR_WIDE_ARCH_MINOR(x) (((x) >> 48) & 0xff)
> +#define DRM_PANTHOR_WIDE_ARCH_REV(x) (((x) >> 40) & 0xff)
> +#define DRM_PANTHOR_WIDE_PRODUCT_MAJOR(x) (((x) >> 32) & 0xff)
> +#define DRM_PANTHOR_WIDE_VERSION_MAJOR(x) (((x) >> 16) & 0xff)
> +#define DRM_PANTHOR_WIDE_VERSION_MINOR(x) (((x) >> 8) & 0xff)
> +#define DRM_PANTHOR_WIDE_VERSION_STATUS(x) ((x) & 0xff)
> };
>
> /**
> --
> 2.43.0
>
next prev parent reply other threads:[~2026-11-19 8:01 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
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 [this message]
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=20261119090118.7cfc417b@fedora1.home \
--to=boris.brezillon@collabora.com \
--cc=airlied@gmail.com \
--cc=akash.goel@arm.com \
--cc=aliceryhl@google.com \
--cc=chris.diamand@arm.com \
--cc=daniel.almeida@collabora.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=rust-for-linux@vger.kernel.org \
--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.