drm/amdgpu: fix cyan_skillfish2 gpu info fw handling

alexdeucher · alexdeucher · commit 7fa666ab07ba · 2025-11-26T12:34:16.000-05:00
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: fa819e3 ("drm/amdgpu: add support for cyan skillfish gpu_info") Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 5427e32)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2638,6 +2638,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)`
`2638`	`2638`	`chip_name = "navi12";`
`2639`	`2639`	`break;`
`2640`	`2640`	`case CHIP_CYAN_SKILLFISH:`
	`2641`	`+ if (adev->mman.discovery_bin)`
	`2642`	`+ return 0;`
`2641`	`2643`	`chip_name = "cyan_skillfish";`
`2642`	`2644`	`break;`
`2643`	`2645`	`}`