From dd61508a38b677dfffc66d5591257ee1e21a4597 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 17 Feb 2018 11:28:03 +0000 Subject: lib: Remove overzealous assertion on gem_set_caching() When the asserts were added for the acceptable error codes for SET_CACHING ioctl, foresight was not given to the possibility that the device may not handle the caching mode and return -ENODEV. Remove the error code assertion from the library, that is the job for the ABI tests. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- lib/ioctl_wrappers.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/ioctl_wrappers.c') diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 7b656cce..8748cfcf 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -208,10 +208,10 @@ static int __gem_set_caching(int fd, uint32_t handle, uint32_t caching) arg.caching = caching; err = 0; - if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_SET_CACHING, &arg)) { + if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_SET_CACHING, &arg)) err = -errno; - igt_assert(errno == ENOTTY || errno == EINVAL); - } + + errno = 0; return err; } @@ -229,7 +229,6 @@ static int __gem_set_caching(int fd, uint32_t handle, uint32_t caching) void gem_set_caching(int fd, uint32_t handle, uint32_t caching) { igt_require(__gem_set_caching(fd, handle, caching) == 0); - errno = 0; } /** -- cgit v1.2.3