Commit 0c701415 authored by Jiansong Chen's avatar Jiansong Chen Committed by Alex Deucher
Browse files

drm/amdgpu: remove gpu_info fw support for sienna_cichlid etc. 



Remove gpu_info fw support for sienna_cichlid etc., since the
information can be retrieved from discovery binary.

Signed-off-by: default avatarJiansong Chen <Jiansong.Chen@amd.com>
Reviewed-by: default avatarLikun Gao <Likun.Gao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 97cf3299

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

+2 −8
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ 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");

MODULE_FIRMWARE("amdgpu/sienna_cichlid_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navy_flounder_gpu_info.bin");



#define AMDGPU_RESUME_MS		2000
@@ -1600,6 +1598,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
	case CHIP_CARRIZO:

	case CHIP_STONEY:

	case CHIP_VEGA20:

	case CHIP_SIENNA_CICHLID:

	case CHIP_NAVY_FLOUNDER:

	default:

		return 0;

	case CHIP_VEGA10:
@@ -1631,12 +1631,6 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
	case CHIP_NAVI12:

		chip_name = "navi12";

		break;

	case CHIP_SIENNA_CICHLID:

		chip_name = "sienna_cichlid";

		break;

	case CHIP_NAVY_FLOUNDER:

		chip_name = "navy_flounder";

		break;

	}



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE