openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "drm/amd/display: enable S/G for RAVEN chip" 

This reverts commit 1c42591591.

S/G display is not stable with the IOMMU enabled on some
platforms.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205523
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Alex Deucher 2019-11-15 10:26:52 -05:00
parent 941a0a7945
commit a0184d7116
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
View File

@ -511,7 +511,7 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,
* Also, don't allow GTT domain if the BO doens't have USWC falg set. * Also, don't allow GTT domain if the BO doens't have USWC falg set.
*/ */
if (adev->asic_type >= CHIP_CARRIZO && if (adev->asic_type >= CHIP_CARRIZO &&
adev->asic_type <= CHIP_RAVEN && adev->asic_type < CHIP_RAVEN &&
(adev->flags & AMD_IS_APU) && (adev->flags & AMD_IS_APU) &&
(bo_flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) && (bo_flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) &&
amdgpu_bo_support_uswc(bo_flags) && amdgpu_bo_support_uswc(bo_flags) &&

2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -688,7 +688,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
*/ */
if (adev->flags & AMD_IS_APU && if (adev->flags & AMD_IS_APU &&
adev->asic_type >= CHIP_CARRIZO && adev->asic_type >= CHIP_CARRIZO &&
adev->asic_type <= CHIP_RAVEN) adev->asic_type < CHIP_RAVEN)
init_data.flags.gpu_vm_support = true; init_data.flags.gpu_vm_support = true;
if (amdgpu_dc_feature_mask & DC_FBC_MASK) if (amdgpu_dc_feature_mask & DC_FBC_MASK)