diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-01-28 14:01:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-01-28 23:24:23 +0100 |
| commit | c4e71212a245017d2ab05f322f7722f0b87a55da (patch) | |
| tree | 44824e4633865cbdc4d08b0e63613f4869bf6f8d /drivers | |
| parent | 8c709f9a06938f6dd743e0b968245d900fa4759e (diff) | |
Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC"
This reverts commit 245595e83fbedda9e107eb0b37cec0ad07733778.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 3eb0f9223bea..ac26c084f30d 100644 --- 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; |