From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 252A4288C81 for ; Wed, 10 Jun 2026 15:57:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781107079; cv=none; b=Y0j+xEw4BCIus2fVQJDC4I1BTfZ1S7AY1F0UADUrp/jfyQKqLiabMzmVdnHStrvw7mT3Hd1R0Zrog1QT+SXNPq7CTC2rJuqlY4RBm/2ozdZEbeAKmEb0Q0g6cZcCv5B6OlYk8gOyVt+rz6DMpI6zRk6WYUFct4mKqIv5MBFD63w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781107079; c=relaxed/simple; bh=Q5iijV3e6PT4d+hlHTO2Ek4GFfSTb3UehfZhp8Qanmo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Iu9ZWFywKAW6HNSVaEGws83EqelsU7vqtAAI6vZ65FsmWb9ASxebcmlmRbqZ9ddMcYXzI0aURj2Bojht6fskc/raF23f1uiCifTXvcITuvMjIXA4GfupsmOmIE4VAULKXQavmwWRJvB256vmRu7nnrRikx0o4XVHdx82KgJCE9I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=gRhTOwv8; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="gRhTOwv8" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5422F1D14; Wed, 10 Jun 2026 08:57:51 -0700 (PDT) Received: from [10.57.29.87] (unknown [10.57.29.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CA0A73F99C; Wed, 10 Jun 2026 08:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781107076; bh=Q5iijV3e6PT4d+hlHTO2Ek4GFfSTb3UehfZhp8Qanmo=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=gRhTOwv8GcynPERUyBPNEZLlqGucOjROdFvErl0kzJNwxvgko+MlSEEKcDtN2ElZj mD6WrcHktiQ7v3jnt7pvCg3lFTbdW1PgAwqmg5UP+R+8ionct8rsn+ZcPpQ4S7Ey7G a5osxMMK4runxgOkXi9eqvjC3jaRndyZZ+uNzdBQ= Message-ID: Date: Wed, 10 Jun 2026 16:57:51 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH 03/18] drm/panthor: Parse and store GPU_ID fields To: Karunika Choo , dri-devel@lists.freedesktop.org Cc: nd@arm.com, Boris Brezillon , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org References: <20260528150546.3168527-1-karunika.choo@arm.com> <20260528150546.3168527-4-karunika.choo@arm.com> From: Steven Price Content-Language: en-GB In-Reply-To: <20260528150546.3168527-4-karunika.choo@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 28/05/2026 16:05, Karunika Choo 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. > > Signed-off-by: Karunika Choo > --- > drivers/gpu/drm/panthor/panthor_device.h | 33 ++++++++++++++++++++++++ > drivers/gpu/drm/panthor/panthor_fw.c | 4 +-- > drivers/gpu/drm/panthor/panthor_gpu.c | 2 +- > drivers/gpu/drm/panthor/panthor_hw.c | 26 +++++++++++++------ > drivers/gpu/drm/panthor/panthor_hw.h | 3 +-- > 5 files changed, 55 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h > index c376e52e8564..8b2a9bb426fc 100644 > --- a/drivers/gpu/drm/panthor/panthor_device.h > +++ b/drivers/gpu/drm/panthor/panthor_device.h > @@ -104,6 +104,36 @@ struct panthor_irq { > atomic_t state; > }; > > +/** > + * struct panthor_gpu_id - Parsed GPU_ID fields > + */ > +struct panthor_gpu_id { > + struct { > + /** @arch.major: Architecture major revision */ > + u8 major; > + > + /** @arch.minor: Architecture minor revision */ > + u8 minor; > + > + /** @arch.rev: Architecture patch revision */ > + u8 rev; > + } arch; > + > + /** @prod_major: Product identifier */ > + u8 prod_major; > + > + struct { > + /** @ver.major: Major release version number */ > + u8 major; > + > + /** @ver.minor: Minor release version number */ > + u8 minor; > + > + /** @ver.status: Status of GPU release */ > + u8 status; > + } ver; NIT: I'm not sure what the point of these nested structs is - it seems inconsistent to have arch.major but prod_major. Is there any good reason not to just collapse this: 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; }; Thanks, Steve > +}; > + > /** > * enum panthor_device_profiling_mode - Profiling state > */ > @@ -160,6 +190,9 @@ struct panthor_device { > /** @csif_info: Command stream interface information. */ > struct drm_panthor_csif_info csif_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 52f176644aa6..784d0a25beb2 100644 > --- a/drivers/gpu/drm/panthor/panthor_fw.c > +++ b/drivers/gpu/drm/panthor/panthor_fw.c > @@ -799,8 +799,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 b63a33fe155e..bb5e64188a15 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 5cf54028f606..3570e2889584 100644 > --- a/drivers/gpu/drm/panthor/panthor_hw.c > +++ b/drivers/gpu/drm/panthor/panthor_hw.c > @@ -120,9 +120,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); > @@ -246,13 +246,13 @@ 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", > - get_gpu_model_name(ptdev), ptdev->gpu_info.gpu_id >> 16, > + get_gpu_model_name(ptdev), ptdev->gpu_id.prod_major, > major, minor, status); > > drm_info(&ptdev->base, > @@ -274,7 +274,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++) { > @@ -296,10 +296,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 f797663893b2..2a666d8cdb98 100644 > --- a/drivers/gpu/drm/panthor/panthor_hw.h > +++ b/drivers/gpu/drm/panthor/panthor_hw.h > @@ -5,7 +5,6 @@ > #define __PANTHOR_HW_H__ > > #include "panthor_device.h" > -#include "panthor_gpu_regs.h" > > /** > * struct panthor_hw_ops - HW operations that are specific to a GPU > @@ -58,7 +57,7 @@ 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; > } > > #endif /* __PANTHOR_HW_H__ */