Commit 065273f7 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/guc: Kill USES_GUC_SUBMISSION macro 



use intel_uc_uses_guc_submission() directly instead, to be consistent in
the way we check what we want to do with the GuC.

v2: do not go through ctx->vm->gt, use i915->gt instead

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> #v1
Reviewed-by: default avatarAndi Shyti <andi.shyti@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200218223327.11058-3-daniele.ceraolospurio@intel.com
parent 34bbfde6

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

+1 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ set_engines__load_balance(struct i915_user_extension __user *base, void *data) 
	if (!HAS_EXECLISTS(i915))

		return -ENODEV;



	if (USES_GUC_SUBMISSION(i915))

	if (intel_uc_uses_guc_submission(&i915->gt.uc))

		return -ENODEV; /* not implement yet */



	if (get_user(idx, &ext->engine_index))

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

+1 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ static int igt_reset_engines_atomic(void *arg) 
	if (!intel_has_reset_engine(gt))

		return 0;



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	igt_global_reset_lock(gt);

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

+6 −6
Original line number Diff line number Diff line
@@ -2109,7 +2109,7 @@ static int live_suppress_self_preempt(void *arg) 
	if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))

		return 0;



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0; /* presume black blox */



	if (intel_vgpu_active(gt->i915))
@@ -3224,7 +3224,7 @@ static int live_virtual_engine(void *arg) 
	unsigned int class, inst;

	int err;



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	for_each_engine(engine, gt, id) {
@@ -3357,7 +3357,7 @@ static int live_virtual_mask(void *arg) 
	unsigned int class, inst;

	int err;



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	for (class = 0; class <= MAX_ENGINE_CLASS; class++) {
@@ -3499,7 +3499,7 @@ static int live_virtual_preserved(void *arg) 
	 * are preserved.

	 */



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	/* As we use CS_GPR we cannot run before they existed on all engines. */
@@ -3729,7 +3729,7 @@ static int live_virtual_bond(void *arg) 
	unsigned int class, inst;

	int err;



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	for (class = 0; class <= MAX_ENGINE_CLASS; class++) {
@@ -3890,7 +3890,7 @@ static int live_virtual_reset(void *arg) 
	 * forgotten.

	 */



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	if (!intel_has_reset_engine(gt))

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int igt_atomic_engine_reset(void *arg) 
	if (!intel_has_reset_engine(gt))

		return 0;



	if (USES_GUC_SUBMISSION(gt->i915))

	if (intel_uc_uses_guc_submission(&gt->uc))

		return 0;



	intel_gt_pm_get(gt);

drivers/gpu/drm/i915/gvt/scheduler.c

+2 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,8 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu) 
		ce->vm = i915_vm_get(&ppgtt->vm);

		intel_context_set_single_submission(ce);



		if (!USES_GUC_SUBMISSION(i915)) { /* Max ring buffer size */

		/* Max ring buffer size */

		if (!intel_uc_uses_guc_submission(&engine->gt->uc)) {

			const unsigned int ring_size = 512 * SZ_4K;



			ce->ring = __intel_context_ring_size(ring_size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE