From: Alex Deucher Date: Fri, 12 Jan 2018 19:56:49 +0000 (-0500) Subject: drm/amdgpu: only allow scatter/gather display with DC X-Git-Tag: v4.17-rc1~27^2~26^2~283 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c9c178b7d76efd9933e709c16063e65135aca74;p=uclinux-h8%2Flinux.git 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 Signed-off-by: Alex Deucher --- 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; }