aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2017-11-15 05:37:23 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-12-06 12:47:49 -0500
commit299c776cebb01c121f5deb77f2d02a8340f072e4 (patch)
treef7a186c35b9272ddea0ee6ca1549983bee5247d1 /drivers/gpu/drm/amd
parent424e2c8580286b75c37dc02f26f4fb6168549d32 (diff)
amdgpu: Don't use DRM_ERROR when failing to allocate a BO
This can be triggered by userspace, e.g. trying to allocate too large a BO, so it shouldn't log anything by default. Callers need to handle failure anyway. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_object.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index e87eedcc0da9..3ad4cf0f22f8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -72,7 +72,7 @@ retry:
72 initial_domain |= AMDGPU_GEM_DOMAIN_GTT; 72 initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
73 goto retry; 73 goto retry;
74 } 74 }
75 DRM_ERROR("Failed to allocate GEM object (%ld, %d, %u, %d)\n", 75 DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
76 size, initial_domain, alignment, r); 76 size, initial_domain, alignment, r);
77 } 77 }
78 return r; 78 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 5acf20cfb1d0..3233d5988f66 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -314,8 +314,8 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,
314 return true; 314 return true;
315 315
316fail: 316fail:
317 DRM_ERROR("BO size %lu > total memory in domain: %llu\n", size, 317 DRM_DEBUG("BO size %lu > total memory in domain: %llu\n", size,
318 man->size << PAGE_SHIFT); 318 man->size << PAGE_SHIFT);
319 return false; 319 return false;
320} 320}
321 321