Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem.c between commit b6c7488df68a
("drm/i915/contexts: fix list corruption") from Linus' tree and commit
69c2fc891343 ("drm/i915: Remove the per-ring write list") from the drm
tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/gpu/drm/i915/i915_gem.c
index 489e2b1,0514593..0000000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -2369,13 -2277,9 +2277,9 @@@ int i915_gpu_idle(struct drm_device *de
if (ret)
return ret;
- ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
+ ret = i915_ring_idle(ring);
if (ret)
return ret;
-
- /* Is the device fubar? */
- if (WARN_ON(!list_empty(&ring->gpu_write_list)))
- return -EBUSY;
}
return 0;
Attachment:
pgpJxzu4kNcer.pgp
Description: PGP signature
