diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2025-11-26 09:40:31 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-12-07 06:27:32 +0900 |
| commit | 4a9a4f9f917c400a3129bf7bcb29e1d2a47cfba2 (patch) | |
| tree | c5e1e6ba835f9409d00c1cfcef53e552e316231c /drivers/gpu | |
| parent | c5ea2e50b5c9aa80c5b53526257540f0c26cd66d (diff) | |
| download | linux-4a9a4f9f917c400a3129bf7bcb29e1d2a47cfba2.tar.gz linux-4a9a4f9f917c400a3129bf7bcb29e1d2a47cfba2.tar.bz2 linux-4a9a4f9f917c400a3129bf7bcb29e1d2a47cfba2.zip | |
drm/amdgpu: fix cyan_skillfish2 gpu info fw handling
[ Upstream commit 7fa666ab07ba9e08f52f357cb8e1aad753e83ac6 ]
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: fa819e3a7c1e ("drm/amdgpu: add support for cyan skillfish gpu_info")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 5427e32fa3a0ba9a016db83877851ed277b065fb)
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index aaee97cd9a10..a713d5e6e401 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2604,6 +2604,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; } |