drm/i915: Consolidate binding parameters into flags

Anything more than just one bool parameter is just a pain to read,
symbolic constants are much better.

Split out from Chris' vma-binding rework patch.

v2: Undo the behaviour change in object_pin that Chris spotted.

v3: Split out misplaced hunk to handle set_cache_level errors,
spotted by Jani.

v4: Keep the current over-zealous binding logic in the execbuffer code
working with a quick hack while the overall binding code gets shuffled
around.

v5: Reorder the PIN_ flags for more natural patch splitup.

v6: Pull out the PIN_GLOBAL split-up again.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index ae6d234b8c12..f256d5fe46f8 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -533,7 +533,7 @@ init_pipe_control(struct intel_ring_buffer *ring)
 
         i915_gem_object_set_cache_level(ring->scratch.obj, I915_CACHE_LLC);
 
-        ret = i915_gem_obj_ggtt_pin(ring->scratch.obj, 4096, true, false);
+        ret = i915_gem_obj_ggtt_pin(ring->scratch.obj, 4096, 0);
         if (ret)
                 goto err_unref;
 
@@ -1273,10 +1273,9 @@ static int init_status_page(struct intel_ring_buffer *ring)
 
         i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
 
-        ret = i915_gem_obj_ggtt_pin(obj, 4096, true, false);
-        if (ret != 0) {
+        ret = i915_gem_obj_ggtt_pin(obj, 4096, PIN_MAPPABLE);
+        if (ret)
                 goto err_unref;
-        }
 
         ring->status_page.gfx_addr = i915_gem_obj_ggtt_offset(obj);
         ring->status_page.page_addr = kmap(sg_page(obj->pages->sgl));
@@ -1356,7 +1355,7 @@ static int intel_init_ring_buffer(struct drm_device *dev,
 
         ring->obj = obj;
 
-        ret = i915_gem_obj_ggtt_pin(obj, PAGE_SIZE, true, false);
+        ret = i915_gem_obj_ggtt_pin(obj, PAGE_SIZE, PIN_MAPPABLE);
         if (ret)
                 goto err_unref;
 
@@ -1919,7 +1918,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                         return -ENOMEM;
                 }
 
-                ret = i915_gem_obj_ggtt_pin(obj, 0, true, false);
+                ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE);
                 if (ret != 0) {
                         drm_gem_object_unreference(&obj->base);
                         DRM_ERROR("Failed to ping batch bo\n");