Skip to content

Commit c4e7121

Browse files
committed
Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC"
This reverts commit 245595e. 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/[email protected]/ Cc: Guido Günther <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 8c709f9 commit c4e7121

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

drivers/gpu/drm/etnaviv/etnaviv_drv.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,6 @@ static int etnaviv_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
292292
if (args->op & ~(ETNA_PREP_READ | ETNA_PREP_WRITE | ETNA_PREP_NOSYNC))
293293
return -EINVAL;
294294

295-
if (args->timeout.tv_nsec > NSEC_PER_SEC)
296-
return -EINVAL;
297-
298295
obj = drm_gem_object_lookup(file, args->handle);
299296
if (!obj)
300297
return -ENOENT;
@@ -358,9 +355,6 @@ static int etnaviv_ioctl_wait_fence(struct drm_device *dev, void *data,
358355
if (args->flags & ~(ETNA_WAIT_NONBLOCK))
359356
return -EINVAL;
360357

361-
if (args->timeout.tv_nsec > NSEC_PER_SEC)
362-
return -EINVAL;
363-
364358
if (args->pipe >= ETNA_MAX_PIPES)
365359
return -EINVAL;
366360

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

415-
if (args->timeout.tv_nsec > NSEC_PER_SEC)
416-
return -EINVAL;
417-
418409
if (args->pipe >= ETNA_MAX_PIPES)
419410
return -EINVAL;
420411

0 commit comments

Comments
 (0)