From 495defcd6c3c3db6b41d469eb5ac3375e46ddfde Mon Sep 17 00:00:00 2001 From: Ashutosh Dixit Date: Tue, 2 Nov 2021 16:30:41 -0700 Subject: lib/i915: Return actual submission method from gem_submission_method gem_submission_method() purports to return the currently used submission method by the kernel, as evidenced by its callers. Therefore remove the GEM_SUBMISSION_EXECLISTS flag when GuC submission is detected. This also fixes gem_has_execlists() to match its description, previously gem_has_execlists() would return true even if GuC submission was actually being used in the driver. v2: Or gem_has_execlists call-sites with gem_has_guc_submission to make the new code equivalent to the previous code. v3: Clarify that submission method is either guc (0x4), execlists (0x2) or legacy without semaphores (0x0) or legacy with semaphores (0x1) v4: Submission methods are now clearly defined as one of guc (3), execlists (2) or legacy ring buffer (1) Reported-by: John Harrison Signed-off-by: Ashutosh Dixit Reviewed-by: John Harrison --- tests/i915/gem_watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/i915/gem_watchdog.c') diff --git a/tests/i915/gem_watchdog.c b/tests/i915/gem_watchdog.c index db562335..21c7710a 100644 --- a/tests/i915/gem_watchdog.c +++ b/tests/i915/gem_watchdog.c @@ -222,7 +222,7 @@ static void virtual(int i915, const intel_ctx_cfg_t *base_cfg) const intel_ctx_t *ctx[num_engines]; uint64_t ahnd; - igt_require(gem_has_execlists(i915)); + igt_require(gem_has_execlists(i915) || gem_has_guc_submission(i915)); igt_debug("%u virtual engines\n", num_engines); igt_require(num_engines); -- cgit v1.2.3