[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Remove workaround for PR...

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

details:   https://anonhg.NetBSD.org/src/rev/53c2abf3f9d8
branches:  trunk
changeset: 808333:53c2abf3f9d8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed May 13 23:57:02 2015 +0000

description:
Remove workaround for PR kern/49195.

Problem seems to have been properly fixed in rev. 1.25.

diffstat:

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

diffs (26 lines):

diff -r a606d5a8d7de -r 53c2abf3f9d8 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Wed May 13 23:15:57 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Wed May 13 23:57:02 2015 +0000
@@ -2806,21 +2806,10 @@
 static void
 i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
 {
-       struct drm_device *dev = obj->base.dev;
-       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
        struct i915_address_space *vm;
        struct i915_vma *vma;
 
-       if ((obj->base.write_domain & I915_GEM_DOMAIN_GTT) != 0) {
-               printk(KERN_ERR "%s: %p 0x%x flushing gtt\n", __func__, obj,
-                       obj->base.write_domain);
-               i915_gem_object_flush_gtt_write_domain(obj);
-       }
-       if ((obj->base.write_domain & I915_GEM_DOMAIN_CPU) != 0) {
-               printk(KERN_ERR "%s: %p 0x%x flushing cpu\n", __func__, obj,
-                       obj->base.write_domain);
-               i915_gem_object_flush_cpu_write_domain(obj, false);
-       }
        BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
        BUG_ON(!obj->active);