aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2010-10-08 14:34:49 +0200
committerDave Airlie <airlied@redhat.com>2010-10-12 20:18:07 +1000
commita8c051f0c8d2f81c665e820f765aaddf86161640 (patch)
tree3ea3b016df21100e22d2971546626f07957b5c41
parentd31dba58480c3cdd458f449261d72ecd15287792 (diff)
downloadmrst-s0i3-test-a8c051f0c8d2f81c665e820f765aaddf86161640.tar.gz
mrst-s0i3-test-a8c051f0c8d2f81c665e820f765aaddf86161640.tar.xz
mrst-s0i3-test-a8c051f0c8d2f81c665e820f765aaddf86161640.zip
drm/radeon/kms: Silent spurious error message
I see the following error message in my kernel log from time to time: radeon 0000:07:00.0: ffff88007c334000 reserve failed for wait radeon 0000:07:00.0: ffff88007c334000 reserve failed for wait After investigation, it turns out that there's nothing to be afraid of and everything works as intended. So remove the spurious log message. Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_object.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index 353998dc2c0..3481bc7f6f5 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -124,11 +124,8 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type,
int r;
r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
- if (unlikely(r != 0)) {
- if (r != -ERESTARTSYS)
- dev_err(bo->rdev->dev, "%p reserve failed for wait\n", bo);
+ if (unlikely(r != 0))
return r;
- }
spin_lock(&bo->tbo.lock);
if (mem_type)
*mem_type = bo->tbo.mem.mem_type;