| Message ID | 20180727155501.18963-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Drop unneed i915 parameter from intel_ring_pin() | expand |
On Fri, 27 Jul 2018 17:55:01 +0200, Chris Wilson <chris@chris-wilson.co.uk> wrote: > 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>
Quoting Michal Wajdeczko (2018-07-27 17:02:45) > On Fri, 27 Jul 2018 17:55:01 +0200, Chris Wilson > <chris@chris-wilson.co.uk> wrote: > > > 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> Done, thanks. -Chris
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7879791b263b..fad689efb67a 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1331,7 +1331,7 @@ __execlists_context_pin(struct intel_engine_cs *engine, goto unpin_vma; } - ret = intel_ring_pin(ce->ring, ctx->i915); + ret = intel_ring_pin(ce->ring); if (ret) goto unpin_map; 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; diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 399ec58d1f9d..57f3787ed6ec 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -797,7 +797,7 @@ struct intel_ring * intel_engine_create_ring(struct intel_engine_cs *engine, struct i915_timeline *timeline, int size); -int intel_ring_pin(struct intel_ring *ring, struct drm_i915_private *i915); +int intel_ring_pin(struct intel_ring *ring); void intel_ring_reset(struct intel_ring *ring, u32 tail); unsigned int intel_ring_update_space(struct intel_ring *ring); void intel_ring_unpin(struct intel_ring *ring);
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> --- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)