Commit 8bf84f60 authored by Aaron Liu's avatar Aaron Liu Committed by Alex Deucher
Browse files

drm/amdgpu: add yellow carp support for gpu_info and ip block setting 



This patch adds yellow carp support for gpu_info firmware and ip
block setting.

Signed-off-by: default avatarAaron Liu <aaron.liu@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 90a187d2

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

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin"); 
MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/vangogh_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/yellow_carp_gpu_info.bin");



#define AMDGPU_RESUME_MS		2000
@@ -1885,6 +1886,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
	case CHIP_VANGOGH:

		chip_name = "vangogh";

		break;

	case CHIP_YELLOW_CARP:

		chip_name = "yellow_carp";

		break;

	}



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);
@@ -2063,8 +2067,11 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	case  CHIP_DIMGREY_CAVEFISH:

	case  CHIP_BEIGE_GOBY:

	case CHIP_VANGOGH:

	case CHIP_YELLOW_CARP:

		if (adev->asic_type == CHIP_VANGOGH)

			adev->family = AMDGPU_FAMILY_VGH;

		else if (adev->asic_type == CHIP_YELLOW_CARP)

			adev->family = AMDGPU_FAMILY_YC;

		else

			adev->family = AMDGPU_FAMILY_NV;