]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amdgpu: add judgement for dc support
authorAsher Song <Asher.Song@amd.com>
Fri, 21 May 2021 09:11:33 +0000 (17:11 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 2 Jun 2021 21:49:15 +0000 (17:49 -0400)
Drop DC initialization when DCN is harvested in VBIOS. The way
doesn't affect virtual display ip initialization.

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Asher Song <Asher.Song@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 66ddfe4f58c2eb1ab393beb56b3a8cde01530052..57ec108b597208421696099d8545cf68d6eab7ba 100644 (file)
@@ -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);