Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51a26a0 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

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



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

Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1eee4228

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

+7 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin"); 
MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
@@ -1428,6 +1429,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
	case CHIP_ARCTURUS:

		chip_name = "arcturus";

		break;

	case CHIP_RENOIR:

		chip_name = "renoir";

		break;

	case CHIP_NAVI10:

		chip_name = "navi10";

		break;
@@ -1580,7 +1584,9 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	case CHIP_VEGA20:

	case CHIP_RAVEN:

	case CHIP_ARCTURUS:

		if (adev->asic_type == CHIP_RAVEN)

	case CHIP_RENOIR:

		if (adev->asic_type == CHIP_RAVEN ||

		    adev->asic_type == CHIP_RENOIR)

			adev->family = AMDGPU_FAMILY_RV;

		else

			adev->family = AMDGPU_FAMILY_AI;