aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-18 20:33:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 10:47:46 -0400
commit48f824862ae88412e7263eba546a570fd874b74f (patch)
tree40707e9d41b53225d6b7d0cee9093908c8e69190
parent7cf84e3ccb91a9e5b2c4fe25ec6a3a79f0e24f98 (diff)
drm/radeon/kms: don't print error on -ERESTARTSYS.
commit 97f23b3d85a4d734a8584dade3a34579931c8f8d upstream. We can get this if the user moves the mouse when we are waiting to move some stuff around in the validate. Don't fail. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 8c56e95c73cb..9933c2c70648 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -248,7 +248,8 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
248 } 248 }
249 r = radeon_cs_parser_relocs(&parser); 249 r = radeon_cs_parser_relocs(&parser);
250 if (r) { 250 if (r) {
251 DRM_ERROR("Failed to parse relocation !\n"); 251 if (r != -ERESTARTSYS)
252 DRM_ERROR("Failed to parse relocation %d!\n", r);
252 radeon_cs_parser_fini(&parser, r); 253 radeon_cs_parser_fini(&parser, r);
253 mutex_unlock(&rdev->cs_mutex); 254 mutex_unlock(&rdev->cs_mutex);
254 return r; 255 return r;