drm/panthor: Add support for Mali-Gx20 and Mali-Gx25 GPUs

This patch adds firmware binary and GPU model naming support for
Mali-Gx20 and Mali-Gx25 GPUs.

Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Karunika Choo <karunika.choo@arm.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Link: https://lore.kernel.org/r/20250807162633.3666310-8-karunika.choo@arm.com

diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c
index fa6e0b48a0b255add0bb43e071cb00dbd9bf5132..9bf06e55eaeea796c22812909d4f758bf48be9be 100644 (file)
--- a/drivers/gpu/drm/panthor/panthor_fw.c
+++ b/drivers/gpu/drm/panthor/panthor_fw.c
@@ -1405,3 +1405,5 @@ MODULE_FIRMWARE("arm/mali/arch10.8/mali_csffw.bin");
 MODULE_FIRMWARE("arm/mali/arch10.10/mali_csffw.bin");
 MODULE_FIRMWARE("arm/mali/arch10.12/mali_csffw.bin");
 MODULE_FIRMWARE("arm/mali/arch11.8/mali_csffw.bin");
+MODULE_FIRMWARE("arm/mali/arch12.8/mali_csffw.bin");
+MODULE_FIRMWARE("arm/mali/arch13.8/mali_csffw.bin");

diff --git a/drivers/gpu/drm/panthor/panthor_hw.c b/drivers/gpu/drm/panthor/panthor_hw.c
index 8c041e1074a16bb73a62db1a320f205c3ffaa098..4f2858114e5ea736246b20aad4f16a398f60c183 100644 (file)
--- a/drivers/gpu/drm/panthor/panthor_hw.c
+++ b/drivers/gpu/drm/panthor/panthor_hw.c
@@ -35,6 +35,24 @@ static char *get_gpu_model_name(struct panthor_device *ptdev)
                fallthrough;
        case GPU_PROD_ID_MAKE(11, 3):
                return "Mali-G615";
+       case GPU_PROD_ID_MAKE(12, 0):
+               if (shader_core_count >= 10 && ray_intersection)
+                       return "Mali-G720-Immortalis";
+               else if (shader_core_count >= 6)
+                       return "Mali-G720";
+
+               fallthrough;
+       case GPU_PROD_ID_MAKE(12, 1):
+               return "Mali-G620";
+       case GPU_PROD_ID_MAKE(13, 0):
+               if (shader_core_count >= 10 && ray_intersection)
+                       return "Mali-G925-Immortalis";
+               else if (shader_core_count >= 6)
+                       return "Mali-G725";
+
+               fallthrough;
+       case GPU_PROD_ID_MAKE(13, 1):
+               return "Mali-G625";
        }
 
        return "(Unknown Mali GPU)";