diff options
author | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2021-11-02 16:30:41 -0700 |
---|---|---|
committer | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2021-11-04 10:31:09 -0700 |
commit | 495defcd6c3c3db6b41d469eb5ac3375e46ddfde (patch) | |
tree | 47edfd7beedc960c3ddbfc34cd9981fa3244f3c7 /tests/i915/gem_watchdog.c | |
parent | 4610041a35717587a784de68fbfe04a3a839b67b (diff) |
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 <john.c.harrison@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Diffstat (limited to 'tests/i915/gem_watchdog.c')
-rw-r--r-- | tests/i915/gem_watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |