drm/i915: Clear GPU read domains on reset

Clear the GPU read domain for the inactive objects on a reset so that
they are correctly invalidated on reuse.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

3 files changed, 19 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index cb1ddc6af6a6..38e889bfd99c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -391,6 +391,11 @@ int i965_reset(struct drm_device *dev, u8 flags)
          */
         i915_gem_reset_flushing_list(dev);
 
+        /* Move everything out of the GPU domains to ensure we do any
+         * necessary invalidation upon reuse.
+         */
+        i915_gem_reset_inactive_gpu_domains(dev);
+
         /*
          * Set the domains we want to reset (GRDOM/bits 2 and 3) as
          * well as the reset bit (GR/bit 0).  Setting the GR bit
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 50fcb91218e8..ae05008a5900 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -998,6 +998,7 @@ int i915_gem_object_put_fence_reg(struct drm_gem_object *obj,
                                   bool interruptible);
 void i915_gem_retire_requests(struct drm_device *dev);
 void i915_gem_reset_flushing_list(struct drm_device *dev);
+void i915_gem_reset_inactive_gpu_domains(struct drm_device *dev);
 void i915_gem_clflush_object(struct drm_gem_object *obj);
 int i915_gem_object_set_domain(struct drm_gem_object *obj,
                                uint32_t read_domains,
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4e978e4044a3..325f52bc1401 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1699,6 +1699,19 @@ void i915_gem_reset_flushing_list(struct drm_device *dev)
         }
 }
 
+void i915_gem_reset_inactive_gpu_domains(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_gem_object *obj_priv;
+
+        list_for_each_entry(obj_priv,
+                            &dev_priv->mm.inactive_list,
+                            list)
+        {
+                obj_priv->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
+        }
+}
+
 /**
  * This function clears the request list as sequence numbers are passed.
  */