Commit d7fd297c authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: add support for psp 13.0.5 



Enabl psp support for psp 13.0.5.

Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ec3ca078

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

+1 −0
Original line number Diff line number Diff line
@@ -1292,6 +1292,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(13, 0, 1):

	case IP_VERSION(13, 0, 2):

	case IP_VERSION(13, 0, 3):

	case IP_VERSION(13, 0, 5):

	case IP_VERSION(13, 0, 8):

		amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block);

		break;

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static int psp_early_init(void *handle) 
		break;

	case IP_VERSION(13, 0, 1):

	case IP_VERSION(13, 0, 3):

	case IP_VERSION(13, 0, 5):

	case IP_VERSION(13, 0, 8):

		psp_v13_0_set_psp_funcs(psp);

		psp->autoload_supported = true;

drivers/gpu/drm/amd/amdgpu/psp_v13_0.c

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ MODULE_FIRMWARE("amdgpu/aldebaran_ta.bin"); 
MODULE_FIRMWARE("amdgpu/yellow_carp_asd.bin");

MODULE_FIRMWARE("amdgpu/yellow_carp_toc.bin");

MODULE_FIRMWARE("amdgpu/yellow_carp_ta.bin");

MODULE_FIRMWARE("amdgpu/psp_13_0_5_asd.bin");

MODULE_FIRMWARE("amdgpu/psp_13_0_5_toc.bin");

MODULE_FIRMWARE("amdgpu/psp_13_0_5_ta.bin");

MODULE_FIRMWARE("amdgpu/psp_13_0_8_asd.bin");

MODULE_FIRMWARE("amdgpu/psp_13_0_8_toc.bin");

MODULE_FIRMWARE("amdgpu/psp_13_0_8_ta.bin");
@@ -58,6 +61,9 @@ static int psp_v13_0_init_microcode(struct psp_context *psp) 
	case IP_VERSION(13, 0, 3):

		chip_name = "yellow_carp";

		break;

	case IP_VERSION(13, 0, 5):

		chip_name = "psp_13_0_5";

		break;

	case IP_VERSION(13, 0, 8):

		chip_name = "psp_13_0_8";

		break;
@@ -75,6 +81,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp) 
		break;

	case IP_VERSION(13, 0, 1):

	case IP_VERSION(13, 0, 3):

	case IP_VERSION(13, 0, 5):

	case IP_VERSION(13, 0, 8):

		err = psp_init_asd_microcode(psp, chip_name);

		if (err)