Module Name: src
Committed By: martin
Date: Tue Dec 30 11:57:49 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gem.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #362):
sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.19
Also need to flush an object from CPU domain.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 \
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.14.2.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14.2.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14.2.3 Mon Nov 10 19:45:54 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Tue Dec 30 11:57:49 2014
@@ -2851,6 +2851,13 @@ i915_gem_object_move_to_inactive(struct
#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);
BUG_ON(!obj->active);
