Commit c4e71212 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC" 

This reverts commit 245595e8.

Guido Günther reported issues with this patch that broke existing
user space. Let's revert it for now and fix it properly later on.

Link: https://patchwork.kernel.org/patch/11291089/
https://lore.kernel.org/lkml/20200121114553.2667556-1-arnd@arndb.de/


Cc: Guido Günther <agx@sigxcpu.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8c709f9a

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -292,9 +292,6 @@ static int etnaviv_ioctl_gem_cpu_prep(struct drm_device *dev, void *data, 
	if (args->op & ~(ETNA_PREP_READ | ETNA_PREP_WRITE | ETNA_PREP_NOSYNC))

	if (args->op & ~(ETNA_PREP_READ | ETNA_PREP_WRITE | ETNA_PREP_NOSYNC))

		return -EINVAL;

		return -EINVAL;





	if (args->timeout.tv_nsec > NSEC_PER_SEC)

		return -EINVAL;



	obj = drm_gem_object_lookup(file, args->handle);

	obj = drm_gem_object_lookup(file, args->handle);

	if (!obj)

	if (!obj)

		return -ENOENT;

		return -ENOENT;
@@ -358,9 +355,6 @@ static int etnaviv_ioctl_wait_fence(struct drm_device *dev, void *data, 
	if (args->flags & ~(ETNA_WAIT_NONBLOCK))

	if (args->flags & ~(ETNA_WAIT_NONBLOCK))

		return -EINVAL;

		return -EINVAL;





	if (args->timeout.tv_nsec > NSEC_PER_SEC)

		return -EINVAL;



	if (args->pipe >= ETNA_MAX_PIPES)

	if (args->pipe >= ETNA_MAX_PIPES)

		return -EINVAL;

		return -EINVAL;
@@ -412,9 +406,6 @@ static int etnaviv_ioctl_gem_wait(struct drm_device *dev, void *data, 
	if (args->flags & ~(ETNA_WAIT_NONBLOCK))

	if (args->flags & ~(ETNA_WAIT_NONBLOCK))

		return -EINVAL;

		return -EINVAL;





	if (args->timeout.tv_nsec > NSEC_PER_SEC)

		return -EINVAL;



	if (args->pipe >= ETNA_MAX_PIPES)

	if (args->pipe >= ETNA_MAX_PIPES)

		return -EINVAL;

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE