Unverified Commit 1d5bf4fd authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Rodrigo Vivi
Browse files

drm/xe/gt_tlb_invalidation_ggtt: Update handling of xe_force_wake_get return 



xe_force_wake_get() now returns the reference count-incremented domain
mask. If it fails for individual domains, the return value will always
be 0. However, for XE_FORCEWAKE_ALL, it may return a non-zero value even
in the event of failure. Update the return handling of xe_force_wake_get()
to reflect this behavior, and ensure that the return value is passed as
input to xe_force_wake_put().

v3
- return xe_wakeref_t instead of int in xe_force_wake_get()

v5
- return unsigned int from xe_force_wake_get()
- remove redundant warns

v7
- Fix commit message

Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarBadal Nilawar <badal.nilawar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014075601.2324382-21-himal.prasad.ghimiray@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 52f8cd72

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

+3 −2
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ static int xe_gt_tlb_invalidation_guc(struct xe_gt *gt, 
int xe_gt_tlb_invalidation_ggtt(struct xe_gt *gt)

{

	struct xe_device *xe = gt_to_xe(gt);

	unsigned int fw_ref;



	if (xe_guc_ct_enabled(&gt->uc.guc.ct) &&

	    gt->uc.guc.submission_state.enabled) {
@@ -286,7 +287,7 @@ int xe_gt_tlb_invalidation_ggtt(struct xe_gt *gt) 
		if (IS_SRIOV_VF(xe))

			return 0;



		xe_gt_WARN_ON(gt, xe_force_wake_get(gt_to_fw(gt), XE_FW_GT));

		fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);

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

			xe_mmio_write32(mmio, PVC_GUC_TLB_INV_DESC1,

					PVC_GUC_TLB_INV_DESC1_INVALIDATE);
@@ -296,7 +297,7 @@ int xe_gt_tlb_invalidation_ggtt(struct xe_gt *gt) 
			xe_mmio_write32(mmio, GUC_TLB_INV_CR,

					GUC_TLB_INV_CR_INVALIDATE);

		}

		xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);

		xe_force_wake_put(gt_to_fw(gt), fw_ref);

	}



	return 0;