[igt-dev] [PATCH i-g-t] i915: Fix gem_context_has_engine_map() for older kernels

* [igt-dev] [PATCH i-g-t] i915: Fix gem_context_has_engine_map() for older kernels
@ 2019-07-02 10:50 Chris Wilson
  2019-07-02 11:43 ` Tvrtko Ursulin
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2019-07-02 10:50 UTC (permalink / raw)
  To: intel-gfx; +Cc: igt-dev

CI is currently breaking on linus/drm-intel-fixes due to the assert that
the kernel supports context engine maps. Report the lack of maps on
older kernels gracefully!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
---
 lib/i915/gem_engine_topology.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
index cae5a0292..cc2b3ff6e 100644
--- a/lib/i915/gem_engine_topology.c
+++ b/lib/i915/gem_engine_topology.c
@@ -321,10 +321,13 @@ bool gem_context_has_engine_map(int fd, uint32_t ctx)
 		.param = I915_CONTEXT_PARAM_ENGINES,
 		.ctx_id = ctx
 	};
-	int ret;
 
-	ret = __gem_context_get_param(fd, &param);
-	igt_assert_eq(ret, 0);
+	/*
+	 * If the kernel is too old to support PARAM_ENGINES,
+	 * then naturally is has no engine map.
+	 */
+	if (__gem_context_get_param(fd, &param))
+		return false;
 
 	return param.size;
 }
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread