Currently, Tyr prints just the upper 16 bits of the GPU_ID register, namely, ARCH_MAJOR, ARCH_MINOR, ARCH_REV, and PRODUCT_MAJOR. This matches the id printed by the panthor driver.
To avoid the manual bit shift, just print the full GPU_ID register. This prints all of the same information and adds the VERSION_MAJOR, VERSION_MINOR, and VERSION_STATUS. Before this change: mali-g610 id 0xa867 major 0x0 minor 0x0 status 0x5 After this change: mali-g610 GPU_ID 0xa8670005 major 0x0 minor 0x0 status 0x5 Signed-off-by: Deborah Brouwer <[email protected]> --- drivers/gpu/drm/tyr/gpu.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tyr/gpu.rs b/drivers/gpu/drm/tyr/gpu.rs index 66fd6c016c62abe3c34669a2e47b680c3a3f873d..4a50055b415c693a89cb99dba241b21351a14149 100644 --- a/drivers/gpu/drm/tyr/gpu.rs +++ b/drivers/gpu/drm/tyr/gpu.rs @@ -124,9 +124,9 @@ pub(crate) fn gpu_info_log(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result dev_info!( dev, - "mali-{} id 0x{:x} major 0x{:x} minor 0x{:x} status 0x{:x}", + "mali-{} GPU_ID 0x{:x} major 0x{:x} minor 0x{:x} status 0x{:x}", model_name, - gpu_id.into_raw() >> 16, + gpu_id.into_raw(), gpu_id.ver_major().get(), gpu_id.ver_minor().get(), gpu_id.ver_status().get() -- 2.52.0
