drm/i915: Drop unneed i915 parameter from intel_ring_pin()

As we now have a ring->vma available, we can just lookup our i915
pointer from inside the vm, and so not require the unsightly parameter.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180727155501.18963-1-chris@chris-wilson.co.uk

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index b293e1dedb8e..d1e03b7fbffa 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1003,10 +1003,11 @@ i915_emit_bb_start(struct i915_request *rq,
         return 0;
 }
 
-int intel_ring_pin(struct intel_ring *ring, struct drm_i915_private *i915)
+int intel_ring_pin(struct intel_ring *ring)
 {
-        enum i915_map_type map = HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC;
         struct i915_vma *vma = ring->vma;
+        enum i915_map_type map =
+                HAS_LLC(vma->vm->i915) ? I915_MAP_WB : I915_MAP_WC;
         unsigned int flags;
         void *addr;
         int ret;
@@ -1405,7 +1406,7 @@ static int intel_init_ring_buffer(struct intel_engine_cs *engine)
                 goto err;
         }
 
-        err = intel_ring_pin(ring, engine->i915);
+        err = intel_ring_pin(ring);
         if (err)
                 goto err_ring;