From: Roger He <Hongbo.He@amd.com>
Date: Fri, 10 Nov 2017 12:00:30 +0000 (+0800)
Subject: drm/amd/amdgpu: if visible VRAM allocation fail, fall back to invisible try again
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8e96e372bceceb76b92a81f8e28bc8163287d25c;p=linux.git

drm/amd/amdgpu: if visible VRAM allocation fail, fall back to invisible try again

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 4710e51099c20..951d625bbdd7d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -63,6 +63,11 @@ retry:
 			     flags, NULL, resv, 0, &bo);
 	if (r) {
 		if (r != -ERESTARTSYS) {
+			if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
+				flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
+				goto retry;
+			}
+
 			if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
 				initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
 				goto retry;