Commit c4991ee0 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Rodrigo Vivi
Browse files

drm/xe/uc: Rename guc_submission_enabled() to uc_enabled() 



The guc_submission_enabled() function is being used as a boolean toggle
for all firmwares and all related features, not just GuC submission. We
could add additional flags/functions to distinguish and allow different
use-cases (e.g. loading HuC but not using GuC submission), but given
that not using GuC is a debug-only scenario having a global switch for
all FWs is enough. However, we want to make it clear that this switch
turns off everything, so rename it to uc_enabled().

v2: rebase on s/XE_WARN_ON/xe_assert

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3856b0f7

drivers/gpu/drm/xe/xe_device.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static inline struct xe_gt *xe_root_mmio_gt(struct xe_device *xe) 
	return xe_device_get_root_tile(xe)->primary_gt;

}



static inline bool xe_device_guc_submission_enabled(struct xe_device *xe)

static inline bool xe_device_uc_enabled(struct xe_device *xe)

{

	return !xe->info.force_execlist;

}

drivers/gpu/drm/xe/xe_exec_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static u32 calc_validate_logical_mask(struct xe_device *xe, struct xe_gt *gt, 
	u16 gt_id;

	u32 return_mask = 0, prev_mask;



	if (XE_IOCTL_DBG(xe, !xe_device_guc_submission_enabled(xe) &&

	if (XE_IOCTL_DBG(xe, !xe_device_uc_enabled(xe) &&

			 len > 1))

		return 0;

drivers/gpu/drm/xe/xe_execlist.c

+3 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int execlist_exec_queue_init(struct xe_exec_queue *q) 
	struct xe_device *xe = gt_to_xe(q->gt);

	int err;



	xe_assert(xe, !xe_device_guc_submission_enabled(xe));

	xe_assert(xe, !xe_device_uc_enabled(xe));



	drm_info(&xe->drm, "Enabling execlist submission (GuC submission disabled)\n");
@@ -371,7 +371,7 @@ static void execlist_exec_queue_fini_async(struct work_struct *w) 
	struct xe_device *xe = gt_to_xe(q->gt);

	unsigned long flags;



	xe_assert(xe, !xe_device_guc_submission_enabled(xe));

	xe_assert(xe, !xe_device_uc_enabled(xe));



	spin_lock_irqsave(&exl->port->lock, flags);

	if (WARN_ON(exl->active_priority != XE_EXEC_QUEUE_PRIORITY_UNSET))
@@ -458,7 +458,7 @@ static const struct xe_exec_queue_ops execlist_exec_queue_ops = { 
int xe_execlist_init(struct xe_gt *gt)

{

	/* GuC submission enabled, nothing to do */

	if (xe_device_guc_submission_enabled(gt_to_xe(gt)))

	if (xe_device_uc_enabled(gt_to_xe(gt)))

		return 0;



	gt->exec_queue_ops = &execlist_exec_queue_ops;

drivers/gpu/drm/xe/xe_ggtt.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void ggtt_invalidate_gt_tlb(struct xe_gt *gt) 
		xe_gt_assert(gt, seqno > 0);

		if (seqno > 0)

			xe_gt_tlb_invalidation_wait(gt, seqno);

	} else if (xe_device_guc_submission_enabled(gt_to_xe(gt))) {

	} else if (xe_device_uc_enabled(gt_to_xe(gt))) {

		struct xe_device *xe = gt_to_xe(gt);



		if (xe->info.platform == XE_PVC) {

drivers/gpu/drm/xe/xe_gt.c

+2 −2
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static int gt_reset(struct xe_gt *gt) 
	int err;



	/* We only support GT resets with GuC submission */

	if (!xe_device_guc_submission_enabled(gt_to_xe(gt)))

	if (!xe_device_uc_enabled(gt_to_xe(gt)))

		return -ENODEV;



	xe_gt_info(gt, "reset started\n");
@@ -642,7 +642,7 @@ int xe_gt_suspend(struct xe_gt *gt) 
	int err;



	/* For now suspend/resume is only allowed with GuC */

	if (!xe_device_guc_submission_enabled(gt_to_xe(gt)))

	if (!xe_device_uc_enabled(gt_to_xe(gt)))

		return -ENODEV;



	xe_gt_sanitize(gt);