drm/i915: Only pwrite through the GTT if there is space in the aperture

Avoid stalling and waiting for the GPU by checking to see if there is
sufficient inactive space in the aperture for us to bind the buffer
prior to writing through the GTT. If there is inadequate space we will
have to stall waiting for the GPU, and incur overheads moving objects
about. Instead, only incur the clflush overhead on the target object by
writing through shmem.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index c828169c73ae..ac93643731aa 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -391,7 +391,7 @@ init_pipe_control(struct intel_ring_buffer *ring)
 
         i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
 
-        ret = i915_gem_object_pin(obj, 4096, true);
+        ret = i915_gem_object_pin(obj, 4096, true, false);
         if (ret)
                 goto err_unref;
 
@@ -979,7 +979,7 @@ static int init_status_page(struct intel_ring_buffer *ring)
 
         i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
 
-        ret = i915_gem_object_pin(obj, 4096, true);
+        ret = i915_gem_object_pin(obj, 4096, true, false);
         if (ret != 0) {
                 goto err_unref;
         }
@@ -1036,7 +1036,7 @@ static int intel_init_ring_buffer(struct drm_device *dev,
 
         ring->obj = obj;
 
-        ret = i915_gem_object_pin(obj, PAGE_SIZE, true);
+        ret = i915_gem_object_pin(obj, PAGE_SIZE, true, false);
         if (ret)
                 goto err_unref;