diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2009-12-08 06:59:34 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-22 19:05:47 -0500 |
commit | 3d3a5b3290043618e8409f3fb68a63de6156fdd4 (patch) | |
tree | c2d7a98ae0e54d997ba56eb90cbd81bc176200ff /drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |
parent | e1f7800315d78686481b27b113a3317ac687b6bf (diff) |
drm/vmwgfx: Return -ERESTARTSYS when interrupted by a signal.
Fixes for TTM API change.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index 7a39f3e6dc2c..7e73cf51e298 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |||
@@ -386,7 +386,7 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv, | |||
386 | return 0; | 386 | return 0; |
387 | 387 | ||
388 | ret = vmw_gmr_bind(dev_priv, bo); | 388 | ret = vmw_gmr_bind(dev_priv, bo); |
389 | if (likely(ret == 0 || ret == -ERESTART)) | 389 | if (likely(ret == 0 || ret == -ERESTARTSYS)) |
390 | return ret; | 390 | return ret; |
391 | 391 | ||
392 | 392 | ||
@@ -429,7 +429,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
429 | 429 | ||
430 | ret = mutex_lock_interruptible(&dev_priv->cmdbuf_mutex); | 430 | ret = mutex_lock_interruptible(&dev_priv->cmdbuf_mutex); |
431 | if (unlikely(ret != 0)) { | 431 | if (unlikely(ret != 0)) { |
432 | ret = -ERESTART; | 432 | ret = -ERESTARTSYS; |
433 | goto out_no_cmd_mutex; | 433 | goto out_no_cmd_mutex; |
434 | } | 434 | } |
435 | 435 | ||