Commit e754dccb authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by John Harrison
Browse files

drm/i915/guc: Unblock GuC submission on Gen11+ 



Unblock GuC submission on Gen11+ platforms.

v2:
 (Martin Peres / John H)
  - Delete debug message when GuC is disabled by default on certain
    platforms

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727002348.97202-34-matthew.brost@intel.com
parent ee242ca7

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

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct intel_guc { 
	struct ida guc_ids;

	struct list_head guc_id_list;



	bool submission_supported;

	bool submission_selected;



	struct i915_vma *ads_vma;

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

+8 −0
Original line number Diff line number Diff line
@@ -2543,6 +2543,13 @@ void intel_guc_submission_disable(struct intel_guc *guc) 
	/* Note: By the time we're here, GuC may have already been reset */

}



static bool __guc_submission_supported(struct intel_guc *guc)

{

	/* GuC submission is unavailable for pre-Gen11 */

	return intel_guc_is_supported(guc) &&

	       GRAPHICS_VER(guc_to_gt(guc)->i915) >= 11;

}



static bool __guc_submission_selected(struct intel_guc *guc)

{

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
@@ -2555,6 +2562,7 @@ static bool __guc_submission_selected(struct intel_guc *guc) 


void intel_guc_submission_init_early(struct intel_guc *guc)

{

	guc->submission_supported = __guc_submission_supported(guc);

	guc->submission_selected = __guc_submission_selected(guc);

}

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

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ int intel_guc_wait_for_pending_msg(struct intel_guc *guc, 


static inline bool intel_guc_submission_is_supported(struct intel_guc *guc)

{

	/* XXX: GuC submission is unavailable for now */

	return false;

	return guc->submission_supported;

}



static inline bool intel_guc_submission_is_wanted(struct intel_guc *guc)

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

+8 −5
Original line number Diff line number Diff line
@@ -34,8 +34,14 @@ static void uc_expand_default_options(struct intel_uc *uc) 
		return;

	}



	/* Default: enable HuC authentication only */

	/* Intermediate platforms are HuC authentication only */

	if (IS_DG1(i915) || IS_ALDERLAKE_S(i915)) {

		i915->params.enable_guc = ENABLE_GUC_LOAD_HUC;

		return;

	}



	/* Default: enable HuC authentication and GuC submission */

	i915->params.enable_guc = ENABLE_GUC_LOAD_HUC | ENABLE_GUC_SUBMISSION;

}



/* Reset GuC providing us with fresh state for both GuC and HuC.
@@ -313,9 +319,6 @@ static int __uc_init(struct intel_uc *uc) 
	if (i915_inject_probe_failure(uc_to_gt(uc)->i915))

		return -ENOMEM;



	/* XXX: GuC submission is unavailable for now */

	GEM_BUG_ON(intel_uc_uses_guc_submission(uc));



	ret = intel_guc_init(guc);

	if (ret)

		return ret;