| Message ID | 20180509065926.19207-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris Wilson <chris@chris-wilson.co.uk> writes: > In igt_flush_test() we try to switch back to the kernel context, but we > are only able to do so when we care called with struct_mutex held. s/care/are > > More CI fallout from lockdep being temporarily suppressed :( Kind words.../o\ Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > > Fixes: 4cdf65ce8cc2 ("drm/i915/selftests: Return to kernel context after each test") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/selftests/igt_flush_test.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c > index 7f35bddc2e95..0d06f559243f 100644 > --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c > +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c > @@ -57,7 +57,8 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags) > > cond_resched(); > > - if (i915_gem_switch_to_kernel_context(i915)) { > + if (flags & I915_WAIT_LOCKED && > + i915_gem_switch_to_kernel_context(i915)) { > pr_err("Failed to switch back to kernel context; declaring wedged\n"); > i915_gem_set_wedged(i915); > } > -- > 2.17.0
Quoting Patchwork (2018-05-09 09:57:55) > == Series Details == > > Series: drm/i915/selftests: Only switch to kernel context when locked > URL : https://patchwork.freedesktop.org/series/42922/ > State : success > > == Summary == > > = CI Bug Log - changes from CI_DRM_4161 -> Patchwork_8958 = > > == Summary - WARNING == > > Minor unknown changes coming with Patchwork_8958 need to be verified > manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_8958, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://patchwork.freedesktop.org/api/1.0/series/42922/revisions/1/mbox/ Pushed it before we have too many CI runs with the error. -Chris
diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c index 7f35bddc2e95..0d06f559243f 100644 --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c @@ -57,7 +57,8 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags) cond_resched(); - if (i915_gem_switch_to_kernel_context(i915)) { + if (flags & I915_WAIT_LOCKED && + i915_gem_switch_to_kernel_context(i915)) { pr_err("Failed to switch back to kernel context; declaring wedged\n"); i915_gem_set_wedged(i915); }
In igt_flush_test() we try to switch back to the kernel context, but we are only able to do so when we care called with struct_mutex held. More CI fallout from lockdep being temporarily suppressed :( Fixes: 4cdf65ce8cc2 ("drm/i915/selftests: Return to kernel context after each test") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/selftests/igt_flush_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)