Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC"
Subsystems (2)
PATCH 1/1 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC"
This reverts commit 172a216ff334ad869b0d74188a70763e4167fd9e.
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.
https://lore.kernel.org/lkml/[email protected]/
Cc Guido Günther <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>
---
I've added this to my branch for inclusion in v5.6 to avoid the regression.
drivers/gpu/drm/etnaviv/etnaviv_drv.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_drv.c +0 -9
@@ -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 ;
Signature · 6 lines
2.25.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel