Commit 7fa666ab authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: fix cyan_skillfish2 gpu info fw handling 

If the board supports IP discovery, we don't need to
parse the gpu info firmware.

Backport to 6.18.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4721


Fixes: fa819e3a ("drm/amdgpu: add support for cyan skillfish gpu_info")
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 5427e32f)
parent b4a7f4e7

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

+2 −0
Original line number Diff line number Diff line
@@ -2638,6 +2638,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
		chip_name = "navi12";

		break;

	case CHIP_CYAN_SKILLFISH:

		if (adev->mman.discovery_bin)

			return 0;

		chip_name = "cyan_skillfish";

		break;

	}