drm/i915: Consolidate flushing the display plane

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

4 files changed, 17 insertions, 50 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 70cbe3cee1ab..24b7796c33af 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1024,7 +1024,6 @@ void i915_gem_free_all_phys_object(struct drm_device *dev);
 int i915_gem_object_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);
 void i915_gem_object_put_pages(struct drm_gem_object *obj);
 void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);
-int i915_gem_object_flush_write_domain(struct drm_gem_object *obj);
 
 void i915_gem_shrinker_init(void);
 void i915_gem_shrinker_exit(void);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9391765af70d..328f8c9ee966 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2645,26 +2645,6 @@ i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj)
                                             old_write_domain);
 }
 
-int
-i915_gem_object_flush_write_domain(struct drm_gem_object *obj)
-{
-        int ret = 0;
-
-        switch (obj->write_domain) {
-        case I915_GEM_DOMAIN_GTT:
-                i915_gem_object_flush_gtt_write_domain(obj);
-                break;
-        case I915_GEM_DOMAIN_CPU:
-                i915_gem_object_flush_cpu_write_domain(obj);
-                break;
-        default:
-                ret = i915_gem_object_flush_gpu_write_domain(obj, true);
-                break;
-        }
-
-        return ret;
-}
-
 /**
  * Moves a single object to the GTT read, and possibly write domain.
  *
@@ -2686,21 +2666,16 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
         if (ret != 0)
                 return ret;
 
-        old_write_domain = obj->write_domain;
-        old_read_domains = obj->read_domains;
+        i915_gem_object_flush_cpu_write_domain(obj);
 
-        /* If we're writing through the GTT domain, then CPU and GPU caches
-         * will need to be invalidated at next use.
-         */
         if (write) {
                 ret = i915_gem_object_wait_rendering(obj);
                 if (ret)
                         return ret;
-
-                obj->read_domains &= I915_GEM_DOMAIN_GTT;
         }
 
-        i915_gem_object_flush_cpu_write_domain(obj);
+        old_write_domain = obj->write_domain;
+        old_read_domains = obj->read_domains;
 
         /* It should now be out of any other write domains, and we can update
          * the domain values for our changes.
@@ -2708,6 +2683,7 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
         BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0);
         obj->read_domains |= I915_GEM_DOMAIN_GTT;
         if (write) {
+                obj->read_domains = I915_GEM_DOMAIN_GTT;
                 obj->write_domain = I915_GEM_DOMAIN_GTT;
                 obj_priv->dirty = 1;
         }
@@ -2773,6 +2749,12 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
          */
         i915_gem_object_set_to_full_cpu_read_domain(obj);
 
+        if (write) {
+                ret = i915_gem_object_wait_rendering(obj);
+                if (ret)
+                        return ret;
+        }
+
         old_write_domain = obj->write_domain;
         old_read_domains = obj->read_domains;
 
@@ -2792,10 +2774,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
          * need to be invalidated at next use.
          */
         if (write) {
-                ret = i915_gem_object_wait_rendering(obj);
-                if (ret)
-                        return ret;
-
                 obj->read_domains &= I915_GEM_DOMAIN_CPU;
                 obj->write_domain = I915_GEM_DOMAIN_CPU;
         }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 16ae34559caa..810ed2dca4c7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1448,6 +1448,12 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
         if (ret != 0)
                 return ret;
 
+        ret = i915_gem_object_set_to_display_plane(obj);
+        if (ret != 0) {
+                i915_gem_object_unpin(obj);
+                return ret;
+        }
+
         /* Install a fence for tiled scan-out. Pre-i965 always needs a
          * fence, whereas 965+ only requires a fence if using
          * framebuffer compression.  For simplicity, we always install
@@ -1589,13 +1595,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 return ret;
         }
 
-        ret = i915_gem_object_set_to_display_plane(obj);
-        if (ret != 0) {
-                i915_gem_object_unpin(obj);
-                mutex_unlock(&dev->struct_mutex);
-                return ret;
-        }
-
         ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y);
         if (ret) {
                 i915_gem_object_unpin(obj);
@@ -5043,9 +5042,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         drm_gem_object_reference(obj);
 
         crtc->fb = fb;
-        ret = i915_gem_object_flush_write_domain(obj);
-        if (ret)
-                goto cleanup_objs;
 
         ret = drm_vblank_get(dev, intel_crtc->pipe);
         if (ret)
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 0ee4a8c16608..e2d13e394a0d 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -93,19 +93,13 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
         mutex_lock(&dev->struct_mutex);
 
+        /* Flush everything out, we'll be doing GTT only from now on */
         ret = intel_pin_and_fence_fb_obj(dev, fbo);
         if (ret) {
                 DRM_ERROR("failed to pin fb: %d\n", ret);
                 goto out_unref;
         }
 
-        /* Flush everything out, we'll be doing GTT only from now on */
-        ret = i915_gem_object_set_to_gtt_domain(fbo, 1);
-        if (ret) {
-                DRM_ERROR("failed to bind fb: %d.\n", ret);
-                goto out_unpin;
-        }
-
         info = framebuffer_alloc(0, device);
         if (!info) {
                 ret = -ENOMEM;