Commit 5d904e3c authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Chris Wilson
Browse files

drm/i915: Pass in intel_gt at some for_each_engine sites 



Where the function, or code segment, operates on intel_gt, we need to
start passing it instead of i915 to for_each_engine(_masked).

This is another partial step in migration of i915->engines[] to
gt->engines[].

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191017094500.21831-2-tvrtko.ursulin@linux.intel.com
parent a50134b1

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

+2 −2
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ bool intel_engines_are_idle(struct intel_gt *gt) 
	if (!READ_ONCE(gt->awake))

		return true;



	for_each_engine(engine, gt->i915, id) {

	for_each_engine(engine, gt, id) {

		if (!intel_engine_is_idle(engine))

			return false;

	}
@@ -1136,7 +1136,7 @@ void intel_engines_reset_default_submission(struct intel_gt *gt) 
	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	for_each_engine(engine, gt->i915, id)

	for_each_engine(engine, gt, id)

		engine->set_default_submission(engine);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void gen6_check_faults(struct intel_gt *gt) 
	enum intel_engine_id id;

	u32 fault;



	for_each_engine(engine, gt->i915, id) {

	for_each_engine(engine, gt, id) {

		fault = GEN6_RING_FAULT_REG_READ(engine);

		if (fault & RING_FAULT_VALID) {

			DRM_DEBUG_DRIVER("Unexpected fault\n"

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

+4 −4
Original line number Diff line number Diff line
@@ -136,16 +136,16 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force) 


	intel_uc_sanitize(&gt->uc);



	for_each_engine(engine, gt->i915, id)

	for_each_engine(engine, gt, id)

		if (engine->reset.prepare)

			engine->reset.prepare(engine);



	if (reset_engines(gt) || force) {

		for_each_engine(engine, gt->i915, id)

		for_each_engine(engine, gt, id)

			__intel_engine_reset(engine, false);

	}



	for_each_engine(engine, gt->i915, id)

	for_each_engine(engine, gt, id)

		if (engine->reset.finish)

			engine->reset.finish(engine);

}
@@ -177,7 +177,7 @@ int intel_gt_resume(struct intel_gt *gt) 
	intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);

	intel_rc6_sanitize(&gt->rc6);



	for_each_engine(engine, gt->i915, id) {

	for_each_engine(engine, gt, id) {

		struct intel_context *ce;



		intel_engine_pm_get(engine);

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static void flush_submission(struct intel_gt *gt) 
	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	for_each_engine(engine, gt->i915, id)

	for_each_engine(engine, gt, id)

		intel_engine_flush_submission(engine);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void hangcheck_elapsed(struct work_struct *work) 
	 */

	intel_uncore_arm_unclaimed_mmio_detection(gt->uncore);



	for_each_engine(engine, gt->i915, id) {

	for_each_engine(engine, gt, id) {

		struct hangcheck hc;



		intel_engine_breadcrumbs_irq(engine);
@@ -303,7 +303,7 @@ static void hangcheck_elapsed(struct work_struct *work) 
	if (GEM_SHOW_DEBUG() && (hung | stuck)) {

		struct drm_printer p = drm_debug_printer("hangcheck");



		for_each_engine(engine, gt->i915, id) {

		for_each_engine(engine, gt, id) {

			if (intel_engine_is_idle(engine))

				continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE