Commit 09570c50 authored by John Harrison's avatar John Harrison
Browse files

drm/i915/guc: Add an explicit 'submission_initialized' flag 



The LRC descriptor pool is going away. So, stop using it as a check
for whether submission has been initialised or not.

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220302003357.4188363-3-John.C.Harrison@Intel.com
parent 02942b42

drivers/gpu/drm/i915/gt/uc/intel_guc.h

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ struct intel_guc { 
	bool submission_supported;

	/** @submission_selected: tracks whether the user enabled GuC submission */

	bool submission_selected;

	/** @submission_initialized: tracks whether GuC submission has been initialised */

	bool submission_initialized;

	/**

	 * @rc_supported: tracks whether we support GuC rc on the current platform

	 */

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+5 −3
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void guc_lrc_desc_pool_destroy(struct intel_guc *guc) 


static inline bool guc_submission_initialized(struct intel_guc *guc)

{

	return !!guc->lrc_desc_pool_vaddr;

	return guc->submission_initialized;

}



static inline void _reset_lrc_desc(struct intel_guc *guc, u32 id)
@@ -1813,7 +1813,7 @@ int intel_guc_submission_init(struct intel_guc *guc) 
	struct intel_gt *gt = guc_to_gt(guc);

	int ret;



	if (guc->lrc_desc_pool)

	if (guc->submission_initialized)

		return 0;



	ret = guc_lrc_desc_pool_create(guc);
@@ -1832,19 +1832,21 @@ int intel_guc_submission_init(struct intel_guc *guc) 


	guc->timestamp.ping_delay = (POLL_TIME_CLKS / gt->clock_frequency + 1) * HZ;

	guc->timestamp.shift = gpm_timestamp_shift(gt);

	guc->submission_initialized = true;



	return 0;

}



void intel_guc_submission_fini(struct intel_guc *guc)

{

	if (!guc->lrc_desc_pool)

	if (!guc->submission_initialized)

		return;



	guc_flush_destroyed_contexts(guc);

	guc_lrc_desc_pool_destroy(guc);

	i915_sched_engine_put(guc->sched_engine);

	bitmap_free(guc->submission_state.guc_ids_bitmap);

	guc->submission_initialized = false;

}



static inline void queue_request(struct i915_sched_engine *sched_engine,