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

drm/amdgpu: refine isp firmware loading 



refine isp 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 75be61aa

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

+1 −3
Original line number Diff line number Diff line
@@ -97,16 +97,14 @@ static int isp_load_fw_by_psp(struct amdgpu_device *adev) 
{

	const struct common_firmware_header *hdr;

	char ucode_prefix[10];

	char fw_name[40];

	int r = 0;



	/* get isp fw binary name and path */

	amdgpu_ucode_ip_version_decode(adev, ISP_HWIP, ucode_prefix,

				       sizeof(ucode_prefix));

	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix);



	/* read isp fw */

	r = amdgpu_ucode_request(adev, &adev->isp.fw, fw_name);

	r = amdgpu_ucode_request(adev, &adev->isp.fw, "amdgpu/%s.bin", ucode_prefix);

	if (r) {

		amdgpu_ucode_release(&adev->isp.fw);

		return r;