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

This reverts commit 609d7c128fa90576e96fc3362c1f8dd057857f43.

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: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 3eb0f9223beac6842cc24c6f4ac2111a4605f0fe..ac26c084f30db23ae62b435afbf92c68e45a753f 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -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))
                return -EINVAL;
 
-       if (args->timeout.tv_nsec > NSEC_PER_SEC)
-               return -EINVAL;
-
        obj = drm_gem_object_lookup(file, args->handle);
        if (!obj)
                return -ENOENT;
@@ -358,9 +355,6 @@ static int etnaviv_ioctl_wait_fence(struct drm_device *dev, void *data,
        if (args->flags & ~(ETNA_WAIT_NONBLOCK))
                return -EINVAL;
 
-       if (args->timeout.tv_nsec > NSEC_PER_SEC)
-               return -EINVAL;
-
        if (args->pipe >= ETNA_MAX_PIPES)
                return -EINVAL;
 
@@ -412,9 +406,6 @@ static int etnaviv_ioctl_gem_wait(struct drm_device *dev, void *data,
        if (args->flags & ~(ETNA_WAIT_NONBLOCK))
                return -EINVAL;
 
-       if (args->timeout.tv_nsec > NSEC_PER_SEC)
-               return -EINVAL;
-
        if (args->pipe >= ETNA_MAX_PIPES)
                return -EINVAL;