Module Name: src
Committed By: riastradh
Date: Tue Mar 3 14:31:48 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Re-enable prints to diagnose PR 49195.
I believe I fixed this problem by fixing __wait_seqno, but before I
remove the workaround I'll try to make sure it's not getting hit any
more.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.24 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.25
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.24 Mon Mar 2 17:30:17 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Tue Mar 3 14:31:48 2015
@@ -2872,17 +2872,13 @@ i915_gem_object_move_to_inactive(struct
struct i915_vma *vma;
if ((obj->base.write_domain & I915_GEM_DOMAIN_GTT) != 0) {
-#if 0
printk(KERN_ERR "%s: %p 0x%x flushing gtt\n", __func__, obj,
obj->base.write_domain);
-#endif
i915_gem_object_flush_gtt_write_domain(obj);
}
if ((obj->base.write_domain & I915_GEM_DOMAIN_CPU) != 0) {
-#if 0
printk(KERN_ERR "%s: %p 0x%x flushing cpu\n", __func__, obj,
obj->base.write_domain);
-#endif
i915_gem_object_flush_cpu_write_domain(obj, false);
}
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
