From 4dd9af72f5b9149c3677ec59632e1abeacc3c5f8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 15 Dec 2009 10:39:48 +1000 Subject: [PATCH] --- yaml --- r: 177053 b: refs/heads/master c: ecabd32a623eaf3e4c853ff73f200c8079028000 h: refs/heads/master i: 177051: 87ba603ebda89f7a5c96413f734df52bfd9880bb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f609596ff5a2..1aac9cd49fb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d03d858970a158fa82d9ba0d502bdea0bdb3ad33 +refs/heads/master: ecabd32a623eaf3e4c853ff73f200c8079028000 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_gem.c b/trunk/drivers/gpu/drm/radeon/radeon_gem.c index 2944486871b0..ee827cc22afe 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_gem.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_gem.c @@ -66,8 +66,9 @@ int radeon_gem_object_create(struct radeon_device *rdev, int size, } r = radeon_bo_create(rdev, gobj, size, kernel, initial_domain, &robj); if (r) { - DRM_ERROR("Failed to allocate GEM object (%d, %d, %u)\n", - size, initial_domain, alignment); + if (r != -ERESTARTSYS) + DRM_ERROR("Failed to allocate GEM object (%d, %d, %u, %d)\n", + size, initial_domain, alignment, r); mutex_lock(&rdev->ddev->struct_mutex); drm_gem_object_unreference(gobj); mutex_unlock(&rdev->ddev->struct_mutex);