summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2018-01-12 22:56:49 +0300
committerAlex Deucher <alexander.deucher@amd.com>2018-02-19 22:17:39 +0300
commit2c9c178b7d76efd9933e709c16063e65135aca74 (patch)
treed8eaccd10e457b157964d160991536a3bb5ce258 /drivers/gpu/drm
parent5d43be0ccbc2f94aa872dfbe37c969510b8c77d6 (diff)
downloadlinux-2c9c178b7d76efd9933e709c16063e65135aca74.tar.xz
drm/amdgpu: only allow scatter/gather display with DC
Check if DC is enabled before allowing scanout buffers to be pinned in system memory. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_display.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 8ede2645a06c..859942552e9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -507,9 +507,12 @@ uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
{
uint32_t domain = AMDGPU_GEM_DOMAIN_VRAM;
+#if defined(CONFIG_DRM_AMD_DC)
if (adev->asic_type >= CHIP_CARRIZO && adev->asic_type < CHIP_RAVEN &&
- adev->flags & AMD_IS_APU)
+ adev->flags & AMD_IS_APU &&
+ amdgpu_device_asic_has_dc_support(adev->asic_type))
domain |= AMDGPU_GEM_DOMAIN_GTT;
+#endif
return domain;
}