[src/netbsd-7]: src/sys/external/bsd/drm2/dist/drm/i915 Pull up following rev...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a1c6f0d2578
branches:  netbsd-7
changeset: 798757:4a1c6f0d2578
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 30 11:57:49 2014 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (17 lines):

diff -r 5b77c7d55f10 -r 4a1c6f0d2578 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Dec 29 18:26:25 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Tue Dec 30 11:57:49 2014 +0000
@@ -2851,6 +2851,13 @@
 #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);