diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-11-28 04:56:37 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-11-28 04:57:04 +0300 |
| commit | 4fc3ad63dd31e9ecd44211a4cd331acebb077551 (patch) | |
| tree | 2c3abbb5da936ec4c7d7ebd30cb977500d7618c9 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | b31e2e3bb744c8fa852ad2a70712db97147071c9 (diff) | |
| parent | 7fa666ab07ba9e08f52f357cb8e1aad753e83ac6 (diff) | |
| download | linux-4fc3ad63dd31e9ecd44211a4cd331acebb077551.tar.xz | |
Merge tag 'amd-drm-fixes-6.18-2025-11-26' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.18-2025-11-26:
amdgpu:
- Unified MES fix
- HDMI fix
- Cursor fix
- Bightness fix
- EDID reading improvement
- UserQ fix
- Cyan Skillfish IP discovery fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20251126204925.3316684-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -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 076bbc09f30c..96b6738e6252 100644 --- 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; } |