Commit ab349049 authored by Karunika Choo's avatar Karunika Choo Committed by Boris Brezillon
Browse files

drm/panthor: Add support for Mali-G1 GPUs 



Add support for Mali-G1 GPUs (CSF architecture v14), introducing a new
panthor_hw_arch_v14 entry with reset and L2 power management operations
via the PWR_CONTROL block.

Mali-G1 introduces a dedicated PWR_CONTROL block for managing resets and
power domains. panthor_gpu_info_init() is updated to use this block for
L2, tiler, and shader domain present register reads.

Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarKarunika Choo <karunika.choo@arm.com>
Link: https://patch.msgid.link/20251125125548.3282320-9-karunika.choo@arm.com


Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
parent 2008f49a

drivers/gpu/drm/panthor/panthor_fw.c

+1 −0
Original line number Diff line number Diff line
@@ -1503,3 +1503,4 @@ 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");

MODULE_FIRMWARE("arm/mali/arch14.8/mali_csffw.bin");

drivers/gpu/drm/panthor/panthor_hw.c

+31 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "panthor_device.h"

#include "panthor_gpu.h"

#include "panthor_hw.h"

#include "panthor_pwr.h"

#include "panthor_regs.h"



#define GPU_PROD_ID_MAKE(arch_major, prod_major) \
@@ -31,12 +32,25 @@ static struct panthor_hw panthor_hw_arch_v10 = { 
	},

};



static struct panthor_hw panthor_hw_arch_v14 = {

	.ops = {

		.soft_reset = panthor_pwr_reset_soft,

		.l2_power_off = panthor_pwr_l2_power_off,

		.l2_power_on = panthor_pwr_l2_power_on,

	},

};



static struct panthor_hw_entry panthor_hw_match[] = {

	{

		.arch_min = 10,

		.arch_max = 13,

		.hwdev = &panthor_hw_arch_v10,

	},

	{

		.arch_min = 14,

		.arch_max = 14,

		.hwdev = &panthor_hw_arch_v14,

	},

};



static char *get_gpu_model_name(struct panthor_device *ptdev)
@@ -84,6 +98,12 @@ static char *get_gpu_model_name(struct panthor_device *ptdev) 
		fallthrough;

	case GPU_PROD_ID_MAKE(13, 1):

		return "Mali-G625";

	case GPU_PROD_ID_MAKE(14, 0):

		return "Mali-G1-Ultra";

	case GPU_PROD_ID_MAKE(14, 1):

		return "Mali-G1-Premium";

	case GPU_PROD_ID_MAKE(14, 3):

		return "Mali-G1-Pro";

	}



	return "(Unknown Mali GPU)";
@@ -110,12 +130,19 @@ static void panthor_gpu_info_init(struct panthor_device *ptdev) 


	ptdev->gpu_info.as_present = gpu_read(ptdev, GPU_AS_PRESENT);



	/* Introduced in arch 11.x */

	ptdev->gpu_info.gpu_features = gpu_read64(ptdev, GPU_FEATURES);



	if (panthor_hw_has_pwr_ctrl(ptdev)) {

		/* Introduced in arch 14.x */

		ptdev->gpu_info.l2_present = gpu_read64(ptdev, PWR_L2_PRESENT);

		ptdev->gpu_info.tiler_present = gpu_read64(ptdev, PWR_TILER_PRESENT);

		ptdev->gpu_info.shader_present = gpu_read64(ptdev, PWR_SHADER_PRESENT);

	} else {

		ptdev->gpu_info.shader_present = gpu_read64(ptdev, GPU_SHADER_PRESENT);

		ptdev->gpu_info.tiler_present = gpu_read64(ptdev, GPU_TILER_PRESENT);

		ptdev->gpu_info.l2_present = gpu_read64(ptdev, GPU_L2_PRESENT);



	/* Introduced in arch 11.x */

	ptdev->gpu_info.gpu_features = gpu_read64(ptdev, GPU_FEATURES);

	}

}



static void panthor_hw_info_init(struct panthor_device *ptdev)