Commit 5a833995 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Drop i915_request.i915 backpointer 



We infrequently use the direct i915 backpointer from the i915_request,
so do we really need to waste the space in the struct for it? 8 bytes
from the most frequently allocated struct vs an 3 bytes and pointer
chasing in using rq->engine->i915?

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarAkeem G Abodunrin <akeem.g.abodunrin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200602220953.21178-1-chris@chris-wilson.co.uk
parent 6783ebda

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1910,8 +1910,8 @@ static int i915_reset_gen7_sol_offsets(struct i915_request *rq) 
	u32 *cs;

	int i;



	if (!IS_GEN(rq->i915, 7) || rq->engine->id != RCS0) {

		drm_dbg(&rq->i915->drm, "sol reset is gen7/rcs only\n");

	if (!IS_GEN(rq->engine->i915, 7) || rq->engine->id != RCS0) {

		drm_dbg(&rq->engine->i915->drm, "sol reset is gen7/rcs only\n");

		return -EINVAL;

	}

drivers/gpu/drm/i915/gt/gen2_engine_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int gen4_emit_flush_rcs(struct i915_request *rq, u32 mode) 
	cmd = MI_FLUSH;

	if (mode & EMIT_INVALIDATE) {

		cmd |= MI_EXE_FLUSH;

		if (IS_G4X(rq->i915) || IS_GEN(rq->i915, 5))

		if (IS_G4X(rq->engine->i915) || IS_GEN(rq->engine->i915, 5))

			cmd |= MI_INVALIDATE_ISP;

	}

drivers/gpu/drm/i915/gt/intel_context_sseu.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int gen8_emit_rpcs_config(struct i915_request *rq, 
	*cs++ = MI_STORE_DWORD_IMM_GEN4 | MI_USE_GGTT;

	*cs++ = lower_32_bits(offset);

	*cs++ = upper_32_bits(offset);

	*cs++ = intel_sseu_make_rpcs(rq->i915, &sseu);

	*cs++ = intel_sseu_make_rpcs(rq->engine->i915, &sseu);



	intel_ring_advance(rq, cs);

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+2 −4
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ static int measure_breadcrumb_dw(struct intel_context *ce) 
	if (!frame)

		return -ENOMEM;



	frame->rq.i915 = engine->i915;

	frame->rq.engine = engine;

	frame->rq.context = ce;

	rcu_assign_pointer(frame->rq.timeline, ce->timeline);
@@ -1192,8 +1191,7 @@ bool intel_engine_can_store_dword(struct intel_engine_cs *engine) 
	}

}



static int print_sched_attr(struct drm_i915_private *i915,

			    const struct i915_sched_attr *attr,

static int print_sched_attr(const struct i915_sched_attr *attr,

			    char *buf, int x, int len)

{

	if (attr->priority == I915_PRIORITY_INVALID)
@@ -1213,7 +1211,7 @@ static void print_request(struct drm_printer *m, 
	char buf[80] = "";

	int x = 0;



	x = print_sched_attr(rq->i915, &rq->sched.attr, buf, x, sizeof(buf));

	x = print_sched_attr(&rq->sched.attr, buf, x, sizeof(buf));



	drm_printf(m, "%s %llx:%llx%s%s %s @ %dms: %s\n",

		   prefix,

drivers/gpu/drm/i915/gt/intel_lrc.c

+3 −3
Original line number Diff line number Diff line
@@ -3533,7 +3533,7 @@ static int emit_pdps(struct i915_request *rq) 
	int err, i;

	u32 *cs;



	GEM_BUG_ON(intel_vgpu_active(rq->i915));

	GEM_BUG_ON(intel_vgpu_active(rq->engine->i915));



	/*

	 * Beware ye of the dragons, this sequence is magic!
@@ -4512,11 +4512,11 @@ static int gen8_emit_flush_render(struct i915_request *request, 
		 * On GEN9: before VF_CACHE_INVALIDATE we need to emit a NULL

		 * pipe control.

		 */

		if (IS_GEN(request->i915, 9))

		if (IS_GEN(request->engine->i915, 9))

			vf_flush_wa = true;



		/* WaForGAMHang:kbl */

		if (IS_KBL_REVID(request->i915, 0, KBL_REVID_B0))

		if (IS_KBL_REVID(request->engine->i915, 0, KBL_REVID_B0))

			dc_flush_wa = true;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE