Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ddc8c52 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: remove use of -ERESTART 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 81a54877

drivers/gpu/drm/nouveau/nouveau_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

	}

drivers/gpu/drm/nouveau/nouveau_gem.c

+0 −7
Original line number Diff line number Diff line
@@ -342,8 +342,6 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, 
			}



			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;

	}