Commit ef2fb720 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/execlists: Refactor out complete_preempt_context() 



As a complement to inject_preempt_context(), follow up with the function
to handle its completion. This will be useful should we wish to extend
the duties of the preempt-context for execlists.

v2: And do the same for the guc.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Jeff McGee <jeff.mcgee@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Jeff McGee <jeff.mcgee@intel.com> #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20180516183355.10553-3-chris@chris-wilson.co.uk
parent f351d087

drivers/gpu/drm/i915/intel_guc_submission.c

+17 −9
Original line number Diff line number Diff line
@@ -623,6 +623,21 @@ static void wait_for_guc_preempt_report(struct intel_engine_cs *engine) 
	report->report_return_status = INTEL_GUC_REPORT_STATUS_UNKNOWN;

}



static void complete_preempt_context(struct intel_engine_cs *engine)

{

	struct intel_engine_execlists *execlists = &engine->execlists;



	GEM_BUG_ON(!execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT));



	execlists_cancel_port_requests(execlists);

	execlists_unwind_incomplete_requests(execlists);



	wait_for_guc_preempt_report(engine);

	intel_write_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX, 0);



	execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);

}



/**

 * guc_submit() - Submit commands through GuC

 * @engine: engine associated with the commands
@@ -793,15 +808,8 @@ static void guc_submission_tasklet(unsigned long data) 


	if (execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT) &&

	    intel_read_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX) ==

	    GUC_PREEMPT_FINISHED) {

		execlists_cancel_port_requests(&engine->execlists);

		execlists_unwind_incomplete_requests(execlists);



		wait_for_guc_preempt_report(engine);



		execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);

		intel_write_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX, 0);

	}

	    GUC_PREEMPT_FINISHED)

		complete_preempt_context(engine);



	if (!execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT))

		guc_dequeue(engine);

drivers/gpu/drm/i915/intel_lrc.c

+13 −10
Original line number Diff line number Diff line
@@ -552,8 +552,18 @@ static void inject_preempt_context(struct intel_engine_cs *engine) 
	if (execlists->ctrl_reg)

		writel(EL_CTRL_LOAD, execlists->ctrl_reg);



	execlists_clear_active(&engine->execlists, EXECLISTS_ACTIVE_HWACK);

	execlists_set_active(&engine->execlists, EXECLISTS_ACTIVE_PREEMPT);

	execlists_clear_active(execlists, EXECLISTS_ACTIVE_HWACK);

	execlists_set_active(execlists, EXECLISTS_ACTIVE_PREEMPT);

}



static void complete_preempt_context(struct intel_engine_execlists *execlists)

{

	GEM_BUG_ON(!execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT));



	execlists_cancel_port_requests(execlists);

	execlists_unwind_incomplete_requests(execlists);



	execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);

}



static bool __execlists_dequeue(struct intel_engine_cs *engine)
@@ -1064,14 +1074,7 @@ static void execlists_submission_tasklet(unsigned long data) 
			if (status & GEN8_CTX_STATUS_COMPLETE &&

			    buf[2*head + 1] == execlists->preempt_complete_status) {

				GEM_TRACE("%s preempt-idle\n", engine->name);



				execlists_cancel_port_requests(execlists);

				execlists_unwind_incomplete_requests(execlists);



				GEM_BUG_ON(!execlists_is_active(execlists,

								EXECLISTS_ACTIVE_PREEMPT));

				execlists_clear_active(execlists,

						       EXECLISTS_ACTIVE_PREEMPT);

				complete_preempt_context(execlists);

				continue;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE