Merge branch 'drm-intel-next-queued' into gvt-next

Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 28c2706e48d7..46b9ea4e6103 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -56,11 +56,23 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
                 alignment = PAGE_SIZE;
         }
 
+retry:
         r = amdgpu_bo_create(adev, size, alignment, initial_domain,
                              flags, type, resv, &bo);
         if (r) {
-                DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
-                          size, initial_domain, alignment, 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;
+                        }
+                        DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
+                                  size, initial_domain, alignment, r);
+                }
                 return r;
         }
         *obj = &bo->gem_base;