Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fb9de1a authored by John Harrison's avatar John Harrison Committed by Daniel Vetter
Browse files

drm/i915: Update intel_ring_begin() to take a request structure 



Now that everything above has been converted to use requests, intel_ring_begin()
can be updated to take a request instead of a ring. This also means that it no
longer needs to lazily allocate a request if no-one happens to have done it
earlier.

For: VIZ-5115
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarTomas Elf <tomas.elf@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bba09b12

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -4894,7 +4894,7 @@ int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice) 
	if (!HAS_L3_DPF(dev) || !remap_info)

		return 0;



	ret = intel_ring_begin(ring, GEN7_L3LOG_SIZE / 4 * 3);

	ret = intel_ring_begin(req, GEN7_L3LOG_SIZE / 4 * 3);

	if (ret)

		return ret;

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) 
	if (INTEL_INFO(ring->dev)->gen >= 7)

		len += 2 + (num_rings ? 4*num_rings + 2 : 0);



	ret = intel_ring_begin(ring, len);

	ret = intel_ring_begin(req, len);

	if (ret)

		return ret;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+4 −4
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ i915_reset_gen7_sol_offsets(struct drm_device *dev, 
		return -EINVAL;

	}



	ret = intel_ring_begin(ring, 4 * 3);

	ret = intel_ring_begin(req, 4 * 3);

	if (ret)

		return ret;
@@ -1113,7 +1113,7 @@ i915_emit_box(struct drm_i915_gem_request *req, 
	}



	if (INTEL_INFO(ring->dev)->gen >= 4) {

		ret = intel_ring_begin(ring, 4);

		ret = intel_ring_begin(req, 4);

		if (ret)

			return ret;
@@ -1122,7 +1122,7 @@ i915_emit_box(struct drm_i915_gem_request *req, 
		intel_ring_emit(ring, ((box->x2 - 1) & 0xffff) | (box->y2 - 1) << 16);

		intel_ring_emit(ring, DR4);

	} else {

		ret = intel_ring_begin(ring, 6);

		ret = intel_ring_begin(req, 6);

		if (ret)

			return ret;
@@ -1298,7 +1298,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, 


	if (ring == &dev_priv->ring[RCS] &&

			instp_mode != dev_priv->relative_constants_mode) {

		ret = intel_ring_begin(ring, 4);

		ret = intel_ring_begin(params->request, 4);

		if (ret)

			goto error;

drivers/gpu/drm/i915/i915_gem_gtt.c

+3 −3
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int gen8_write_pdp(struct drm_i915_gem_request *req, 


	BUG_ON(entry >= 4);



	ret = intel_ring_begin(ring, 6);

	ret = intel_ring_begin(req, 6);

	if (ret)

		return ret;
@@ -1073,7 +1073,7 @@ static int hsw_mm_switch(struct i915_hw_ppgtt *ppgtt, 
	if (ret)

		return ret;



	ret = intel_ring_begin(ring, 6);

	ret = intel_ring_begin(req, 6);

	if (ret)

		return ret;
@@ -1110,7 +1110,7 @@ static int gen7_mm_switch(struct i915_hw_ppgtt *ppgtt, 
	if (ret)

		return ret;



	ret = intel_ring_begin(ring, 6);

	ret = intel_ring_begin(req, 6);

	if (ret)

		return ret;

drivers/gpu/drm/i915/intel_display.c

+5 −5
Original line number Diff line number Diff line
@@ -10876,7 +10876,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev, 
	u32 flip_mask;

	int ret;



	ret = intel_ring_begin(ring, 6);

	ret = intel_ring_begin(req, 6);

	if (ret)

		return ret;
@@ -10911,7 +10911,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev, 
	u32 flip_mask;

	int ret;



	ret = intel_ring_begin(ring, 6);

	ret = intel_ring_begin(req, 6);

	if (ret)

		return ret;
@@ -10944,7 +10944,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev, 
	uint32_t pf, pipesrc;

	int ret;



	ret = intel_ring_begin(ring, 4);

	ret = intel_ring_begin(req, 4);

	if (ret)

		return ret;
@@ -10983,7 +10983,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev, 
	uint32_t pf, pipesrc;

	int ret;



	ret = intel_ring_begin(ring, 4);

	ret = intel_ring_begin(req, 4);

	if (ret)

		return ret;
@@ -11059,7 +11059,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, 
	if (ret)

		return ret;



	ret = intel_ring_begin(ring, len);

	ret = intel_ring_begin(req, len);

	if (ret)

		return ret;