Commit 5503cb0d authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180727155501.18963-1-chris@chris-wilson.co.uk
parent 905febf5

drivers/gpu/drm/i915/intel_lrc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_ringbuffer.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE