drm/amdgpu: fix cyan_skillfish2 gpu info fw handling

alexdeucher · alexdeucher · commit 5427e32fa3a0 · 2025-11-26T11:50:43.000-05:00
If the board supports IP discovery, we don't need to parse the gpu info firmware. 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>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2665,6 +2665,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
 		chip_name = "navi12";
 		break;
 	case CHIP_CYAN_SKILLFISH:
+		if (adev->discovery.bin)
+			return 0;
 		chip_name = "cyan_skillfish";
 		break;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2665,6 +2665,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)`
`2665`	`2665`	`chip_name = "navi12";`
`2666`	`2666`	`break;`
`2667`	`2667`	`case CHIP_CYAN_SKILLFISH:`
	`2668`	`+ if (adev->discovery.bin)`
	`2669`	`+ return 0;`
`2668`	`2670`	`chip_name = "cyan_skillfish";`
`2669`	`2671`	`break;`
`2670`	`2672`	`}`