Commit c697ddcf authored by Matthew Brost's avatar Matthew Brost
Browse files

drm/xe: s/tlb_invalidation/tlb_inval 



tlb_invalidation is a bit verbose leading to ugly wraps in the code,
shorten to tlb_inval.

Signed-off-by: default avatarStuart Summers <stuart.summers@intel.com>
Reviewed-by: default avatarStuart Summers <stuart.summers@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250826182911.392550-4-stuart.summers@intel.com
parent 76186a25

drivers/gpu/drm/xe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ xe-y += xe_bb.o \ 
	xe_gt_pagefault.o \

	xe_gt_sysfs.o \

	xe_gt_throttle.o \

	xe_gt_tlb_invalidation.o \

	xe_gt_tlb_inval.o \

	xe_gt_tlb_inval_job.o \

	xe_gt_topology.o \

	xe_guc.o \

drivers/gpu/drm/xe/xe_device_types.h

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ struct xe_device { 
		u8 has_mbx_power_limits:1;

		/** @info.has_pxp: Device has PXP support */

		u8 has_pxp:1;

		/** @info.has_range_tlb_invalidation: Has range based TLB invalidations */

		u8 has_range_tlb_invalidation:1;

		/** @info.has_range_tlb_inval: Has range based TLB invalidations */

		u8 has_range_tlb_inval:1;

		/** @info.has_sriov: Supports SR-IOV */

		u8 has_sriov:1;

		/** @info.has_usm: Device has unified shared memory support */

drivers/gpu/drm/xe/xe_exec_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int alloc_dep_schedulers(struct xe_device *xe, struct xe_exec_queue *q) 
		if (!gt)

			continue;



		wq = gt->tlb_invalidation.job_wq;

		wq = gt->tlb_inval.job_wq;



#define MAX_TLB_INVAL_JOBS	16	/* Picking a reasonable value */

		dep_scheduler = xe_dep_scheduler_create(xe, wq, q->name,

drivers/gpu/drm/xe/xe_ggtt.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "xe_device.h"

#include "xe_gt.h"

#include "xe_gt_printk.h"

#include "xe_gt_tlb_invalidation.h"

#include "xe_gt_tlb_inval.h"

#include "xe_map.h"

#include "xe_mmio.h"

#include "xe_pm.h"
@@ -438,7 +438,7 @@ static void ggtt_invalidate_gt_tlb(struct xe_gt *gt) 
	if (!gt)

		return;



	err = xe_gt_tlb_invalidation_ggtt(gt);

	err = xe_gt_tlb_inval_ggtt(gt);

	xe_gt_WARN(gt, err, "Failed to invalidate GGTT (%pe)", ERR_PTR(err));

}

drivers/gpu/drm/xe/xe_gt.c

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "xe_gt_sriov_pf.h"

#include "xe_gt_sriov_vf.h"

#include "xe_gt_sysfs.h"

#include "xe_gt_tlb_invalidation.h"

#include "xe_gt_tlb_inval.h"

#include "xe_gt_topology.h"

#include "xe_guc_exec_queue_types.h"

#include "xe_guc_pc.h"
@@ -413,7 +413,7 @@ int xe_gt_init_early(struct xe_gt *gt) 
	xe_force_wake_init_gt(gt, gt_to_fw(gt));

	spin_lock_init(&gt->global_invl_lock);



	err = xe_gt_tlb_invalidation_init_early(gt);

	err = xe_gt_tlb_inval_init_early(gt);

	if (err)

		return err;
@@ -603,7 +603,7 @@ static void xe_gt_fini(void *arg) 
	struct xe_gt *gt = arg;

	int i;



	xe_gt_tlb_invalidation_fini(gt);

	xe_gt_tlb_inval_fini(gt);



	for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i)

		xe_hw_fence_irq_finish(&gt->fence_irq[i]);
@@ -852,7 +852,7 @@ static int gt_reset(struct xe_gt *gt) 


	xe_uc_stop(&gt->uc);



	xe_gt_tlb_invalidation_reset(gt);

	xe_gt_tlb_inval_reset(gt);



	err = do_gt_reset(gt);

	if (err)
@@ -1066,5 +1066,5 @@ void xe_gt_declare_wedged(struct xe_gt *gt) 
	xe_gt_assert(gt, gt_to_xe(gt)->wedged.mode);



	xe_uc_declare_wedged(&gt->uc);

	xe_gt_tlb_invalidation_reset(gt);

	xe_gt_tlb_inval_reset(gt);

}