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: fa819e3a7c1e ("drm/amdgpu: add support for cyan skillfish gpu_info")
Signed-off-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index a99a2b911529f..0d729284c117c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2675,6 +2675,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;
        }
-- 
2.51.1

Reply via email to