[Intel-gfx] [PATCH i-g-t v3 09/11] tests/i915/module_load: update for discrete

[Matthew Auld]

The set_caching ioctl is gone for discrete, and now just returns
-ENODEV. Update the gem_sanitycheck to account for that. After this we
should be back to just having the breakage caused by missing reloc
support for the reload testcase.

Signed-off-by: Matthew Auld 
Cc: Maarten Lankhorst 
Cc: Ashutosh Dixit 
Cc: Daniel Vetter 
Cc: Ramalingam C 
---
 tests/i915/i915_module_load.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
index 98ceb5d8..4b42fe3e 100644
--- a/tests/i915/i915_module_load.c
+++ b/tests/i915/i915_module_load.c
@@ -172,17 +172,22 @@ static void gem_sanitycheck(void)
 {
struct drm_i915_gem_caching args = {};
int i915 = __drm_open_driver(DRIVER_INTEL);
+   int expected;
int err;
 
+   expected = -ENOENT;
+   if (gem_has_lmem(i915))
+   expected = -ENODEV;
+
err = 0;
if (ioctl(i915, DRM_IOCTL_I915_GEM_SET_CACHING, &args))
err = -errno;
-   if (err == -ENOENT)
+   if (err == expected)
store_all(i915);
errno = 0;
 
close(i915);
-   igt_assert_eq(err, -ENOENT);
+   igt_assert_eq(err, expected);
 }
 
 static void
-- 
2.26.3

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t v3 09/11] tests/i915/module_load: update for discrete

[Dixit, Ashutosh]

On Fri, 30 Jul 2021 01:53:46 -0700, Matthew Auld wrote:
>
> The set_caching ioctl is gone for discrete, and now just returns
> -ENODEV. Update the gem_sanitycheck to account for that. After this we
> should be back to just having the breakage caused by missing reloc
> support for the reload testcase.
>
> Signed-off-by: Matthew Auld 
> Cc: Maarten Lankhorst 
> Cc: Ashutosh Dixit 
> Cc: Daniel Vetter 
> Cc: Ramalingam C 
> ---
>  tests/i915/i915_module_load.c | 9 +++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
> index 98ceb5d8..4b42fe3e 100644
> --- a/tests/i915/i915_module_load.c
> +++ b/tests/i915/i915_module_load.c
> @@ -172,17 +172,22 @@ static void gem_sanitycheck(void)
>  {
>   struct drm_i915_gem_caching args = {};
>   int i915 = __drm_open_driver(DRIVER_INTEL);
> + int expected;

If we want to reduce a couple of line of code this is:

int expected = gem_has_lmem(i915) ? -ENODEV : -ENOENT;

Otherwise this is:

Reviewed-by: Ashutosh Dixit 

>   int err;
>
> + expected = -ENOENT;
> + if (gem_has_lmem(i915))
> + expected = -ENODEV;
> +
>   err = 0;
>   if (ioctl(i915, DRM_IOCTL_I915_GEM_SET_CACHING, &args))
>   err = -errno;
> - if (err == -ENOENT)
> + if (err == expected)
>   store_all(i915);
>   errno = 0;
>
>   close(i915);
> - igt_assert_eq(err, -ENOENT);
> + igt_assert_eq(err, expected);
>  }
>
>  static void
> --
> 2.26.3
>