2 files changed, 1 insertions, 8 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 0cff7eb3690..dacac9a0842 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -205,7 +205,7 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
                         schedule_timeout(1);
 
                 if (intr && signal_pending(current)) {
-                        ret = -ERESTART;
+                        ret = -ERESTARTSYS;
                         break;
                 }
         }
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 11f831f0ddc..18fd8ac9fca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -342,8 +342,6 @@ retry:
                         }
 
                         ret = ttm_bo_wait_cpu(&nvbo->bo, false);
-                        if (ret == -ERESTART)
-                                ret = -EAGAIN;
                         if (ret)
                                 return ret;
                         goto retry;
@@ -915,8 +913,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
                         goto out;
 
                 ret = ttm_bo_wait_cpu(&nvbo->bo, no_wait);
-                if (ret == -ERESTART)
-                        ret = -EAGAIN;
                 if (ret)
                         goto out;
         }
@@ -925,9 +921,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
                 ret = ttm_bo_wait(&nvbo->bo, false, false, no_wait);
         } else {
                 ret = ttm_bo_synccpu_write_grab(&nvbo->bo, no_wait);
-                if (ret == -ERESTART)
-                        ret = -EAGAIN;
-                else
                 if (ret == 0)
                         nvbo->cpu_filp = file_priv;
         }