[PATCH v6 6/6] drm/panthor: Add support for Mali-Gx20 and Mali-Gx25 GPUs

[Chia-I Wu]

On Mon, Jul 21, 2025 at 3:53 PM Karunika Choo <karunika.choo at arm.com> wrote:
>
> This patch adds firmware binary and GPU model naming support for
> Mali-Gx20 and Mali-Gx25 GPUs.
>
> The GPU_COHERENCY_FEATURES macros are slightly reworked as the
> assumption that FEATURE = BIT(PROTOCOL) no longer holds with the
> introduction of the SHAREABLE_CACHE_SUPPORT, which is BIT(5) on the
> GPU_COHERENCY_PROTOCOL register. As such, the feature bits are now
> individually defined. Further changes were also made to enable
> SHAREABLE_CACHE_SUPPORT if coherency is enabled and the feature is
> supported.
>
> This patch also fixes a minor bug that incorrectly writes ACE instead of
> ACE_LITE to GPU_COHERENCY_PROTOCOL if coherency is enabled.
>
> Reviewed-by: Liviu Dudau <liviu.dudau at arm.com>
> Signed-off-by: Karunika Choo <karunika.choo at arm.com>
> ---
>  drivers/gpu/drm/panthor/panthor_device.c |  2 +-
>  drivers/gpu/drm/panthor/panthor_fw.c     |  2 ++
>  drivers/gpu/drm/panthor/panthor_gpu.c    | 14 ++++++++++++--
>  drivers/gpu/drm/panthor/panthor_hw.c     | 18 ++++++++++++++++++
>  drivers/gpu/drm/panthor/panthor_regs.h   |  5 ++++-
>  5 files changed, 37 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
> index 81df49880bd8..f547aa4159ec 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.c
> +++ b/drivers/gpu/drm/panthor/panthor_device.c
> @@ -34,7 +34,7 @@ static int panthor_gpu_coherency_init(struct panthor_device *ptdev)
>          * ACE protocol has never been supported for command stream frontend GPUs.
>          */
>         if ((gpu_read(ptdev, GPU_COHERENCY_FEATURES) &
> -                     GPU_COHERENCY_PROT_BIT(ACE_LITE)))
> +            GPU_COHERENCY_FEATURE_ACE_LITE))
Replace gpu_read by ptdev->gpu_info.coherency_features.
>                 return 0;
>
>         drm_err(&ptdev->base, "Coherency not supported by the device");
> diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c
> index fa6e0b48a0b2..9bf06e55eaee 100644
> --- 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_gpu.c b/drivers/gpu/drm/panthor/panthor_gpu.c
> index 5e2c3173ae27..df2419706fe0 100644
> --- a/drivers/gpu/drm/panthor/panthor_gpu.c
> +++ b/drivers/gpu/drm/panthor/panthor_gpu.c
> @@ -45,8 +45,18 @@ struct panthor_gpu {
>
>  static void panthor_gpu_coherency_set(struct panthor_device *ptdev)
>  {
> -       gpu_write(ptdev, GPU_COHERENCY_PROTOCOL,
> -               ptdev->coherent ? GPU_COHERENCY_PROT_BIT(ACE_LITE) : GPU_COHERENCY_NONE);
> +       u32 coherency_protocol = GPU_COHERENCY_NONE;
> +
> +       if (ptdev->coherent) {
> +               coherency_protocol = GPU_COHERENCY_ACE_LITE;
> +
> +               if ((gpu_read(ptdev, GPU_COHERENCY_FEATURES) &
> +                    GPU_COHERENCY_FEATURE_SHAREABLE_CACHE_SUPPORT))
Replace gpu_read by ptdev->gpu_info.coherency_features.
> +                       coherency_protocol |=
> +                               GPU_COHERENCY_SHAREABLE_CACHE_SUPPORT;
> +       }
> +
> +       gpu_write(ptdev, GPU_COHERENCY_PROTOCOL, coherency_protocol);
>  }
>
>  static void panthor_gpu_irq_handler(struct panthor_device *ptdev, u32 status)
> diff --git a/drivers/gpu/drm/panthor/panthor_hw.c b/drivers/gpu/drm/panthor/panthor_hw.c
> index a7583342d797..3fcb69a6f959 100644
> --- 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)";
> diff --git a/drivers/gpu/drm/panthor/panthor_regs.h b/drivers/gpu/drm/panthor/panthor_regs.h
> index 8bee76d01bf8..1beb365c0fec 100644
> --- a/drivers/gpu/drm/panthor/panthor_regs.h
> +++ b/drivers/gpu/drm/panthor/panthor_regs.h
> @@ -111,12 +111,15 @@
>  #define GPU_REVID                                      0x280
>
>  #define GPU_COHERENCY_FEATURES                         0x300
> -#define GPU_COHERENCY_PROT_BIT(name)                   BIT(GPU_COHERENCY_  ## name)
> +#define   GPU_COHERENCY_FEATURE_ACE_LITE               BIT(0)
> +#define   GPU_COHERENCY_FEATURE_ACE                    BIT(1)
> +#define   GPU_COHERENCY_FEATURE_SHAREABLE_CACHE_SUPPORT        BIT(5)
>
>  #define GPU_COHERENCY_PROTOCOL                         0x304
>  #define   GPU_COHERENCY_ACE_LITE                       0
>  #define   GPU_COHERENCY_ACE                            1
>  #define   GPU_COHERENCY_NONE                           31
> +#define   GPU_COHERENCY_SHAREABLE_CACHE_SUPPORT                BIT(5)
>
>  #define MCU_CONTROL                                    0x700
>  #define MCU_CONTROL_ENABLE                             1
> --
> 2.49.0
>