Commit a777c9d7 authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

drm/amdgpu: refine gpu_info firmware loading 



refine gpu_info firmware loading

Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 02593249

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

+4 −5
Original line number Diff line number Diff line
@@ -2350,7 +2350,6 @@ void amdgpu_device_set_sriov_virtual_display(struct amdgpu_device *adev) 
static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)

{

	const char *chip_name;

	char fw_name[40];

	int err;

	const struct gpu_info_firmware_header_v1_0 *hdr;
@@ -2384,12 +2383,12 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
		break;

	}



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

	err = amdgpu_ucode_request(adev, &adev->firmware.gpu_info_fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->firmware.gpu_info_fw,

				   "amdgpu/%s_gpu_info.bin", chip_name);

	if (err) {

		dev_err(adev->dev,

			"Failed to get gpu_info firmware \"%s\"\n",

			fw_name);

			"Failed to get gpu_info firmware \"%s_gpu_info.bin\"\n",

			chip_name);

		goto out;

	}