diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-06-04 02:45:15 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-06-04 02:45:15 +0300 |
| commit | d6273d8f31cdaa7519984951cbfab0a983f219e5 (patch) | |
| tree | dd8fb1c63caba1229b73c585385b501974bc107b /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | ff7a24a8fcb30adfea878d14c394300a087016ba (diff) | |
| parent | e7591a8d56bab89c617dae055446b6337ec32dc9 (diff) | |
| download | linux-d6273d8f31cdaa7519984951cbfab0a983f219e5.tar.xz | |
Merge tag 'amd-drm-fixes-5.13-2021-06-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.13-2021-06-02:
amdgpu:
- Display fixes
- FRU EEPROM error handling fix
- RAS fix
- PSP fix
- Releasing pinned BO fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210603040410.4080-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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 66ddfe4f58c2..57ec108b5972 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3118,7 +3118,9 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) */ bool amdgpu_device_has_dc_support(struct amdgpu_device *adev) { - if (amdgpu_sriov_vf(adev) || adev->enable_virtual_display) + if (amdgpu_sriov_vf(adev) || + adev->enable_virtual_display || + (adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK)) return false; return amdgpu_device_asic_has_dc_support(adev->asic_type); |