Skip to content

Commit c697ddc

Browse files
committed
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: Stuart Summers <stuart.summers@intel.com> Reviewed-by: Stuart Summers <stuart.summers@intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Link: https://lore.kernel.org/r/20250826182911.392550-4-stuart.summers@intel.com
1 parent 76186a2 commit c697ddc

21 files changed

Lines changed: 266 additions & 277 deletions

drivers/gpu/drm/xe/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ xe-y += xe_bb.o \
6161
xe_gt_pagefault.o \
6262
xe_gt_sysfs.o \
6363
xe_gt_throttle.o \
64-
xe_gt_tlb_invalidation.o \
64+
xe_gt_tlb_inval.o \
6565
xe_gt_tlb_inval_job.o \
6666
xe_gt_topology.o \
6767
xe_guc.o \

drivers/gpu/drm/xe/xe_device_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ struct xe_device {
290290
u8 has_mbx_power_limits:1;
291291
/** @info.has_pxp: Device has PXP support */
292292
u8 has_pxp:1;
293-
/** @info.has_range_tlb_invalidation: Has range based TLB invalidations */
294-
u8 has_range_tlb_invalidation:1;
293+
/** @info.has_range_tlb_inval: Has range based TLB invalidations */
294+
u8 has_range_tlb_inval:1;
295295
/** @info.has_sriov: Supports SR-IOV */
296296
u8 has_sriov:1;
297297
/** @info.has_usm: Device has unified shared memory support */

drivers/gpu/drm/xe/xe_exec_queue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int alloc_dep_schedulers(struct xe_device *xe, struct xe_exec_queue *q)
7575
if (!gt)
7676
continue;
7777

78-
wq = gt->tlb_invalidation.job_wq;
78+
wq = gt->tlb_inval.job_wq;
7979

8080
#define MAX_TLB_INVAL_JOBS 16 /* Picking a reasonable value */
8181
dep_scheduler = xe_dep_scheduler_create(xe, wq, q->name,

drivers/gpu/drm/xe/xe_ggtt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "xe_device.h"
2424
#include "xe_gt.h"
2525
#include "xe_gt_printk.h"
26-
#include "xe_gt_tlb_invalidation.h"
26+
#include "xe_gt_tlb_inval.h"
2727
#include "xe_map.h"
2828
#include "xe_mmio.h"
2929
#include "xe_pm.h"
@@ -438,7 +438,7 @@ static void ggtt_invalidate_gt_tlb(struct xe_gt *gt)
438438
if (!gt)
439439
return;
440440

441-
err = xe_gt_tlb_invalidation_ggtt(gt);
441+
err = xe_gt_tlb_inval_ggtt(gt);
442442
xe_gt_WARN(gt, err, "Failed to invalidate GGTT (%pe)", ERR_PTR(err));
443443
}
444444

drivers/gpu/drm/xe/xe_gt.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "xe_gt_sriov_pf.h"
3838
#include "xe_gt_sriov_vf.h"
3939
#include "xe_gt_sysfs.h"
40-
#include "xe_gt_tlb_invalidation.h"
40+
#include "xe_gt_tlb_inval.h"
4141
#include "xe_gt_topology.h"
4242
#include "xe_guc_exec_queue_types.h"
4343
#include "xe_guc_pc.h"
@@ -413,7 +413,7 @@ int xe_gt_init_early(struct xe_gt *gt)
413413
xe_force_wake_init_gt(gt, gt_to_fw(gt));
414414
spin_lock_init(&gt->global_invl_lock);
415415

416-
err = xe_gt_tlb_invalidation_init_early(gt);
416+
err = xe_gt_tlb_inval_init_early(gt);
417417
if (err)
418418
return err;
419419

@@ -603,7 +603,7 @@ static void xe_gt_fini(void *arg)
603603
struct xe_gt *gt = arg;
604604
int i;
605605

606-
xe_gt_tlb_invalidation_fini(gt);
606+
xe_gt_tlb_inval_fini(gt);
607607

608608
for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i)
609609
xe_hw_fence_irq_finish(&gt->fence_irq[i]);
@@ -852,7 +852,7 @@ static int gt_reset(struct xe_gt *gt)
852852

853853
xe_uc_stop(&gt->uc);
854854

855-
xe_gt_tlb_invalidation_reset(gt);
855+
xe_gt_tlb_inval_reset(gt);
856856

857857
err = do_gt_reset(gt);
858858
if (err)
@@ -1066,5 +1066,5 @@ void xe_gt_declare_wedged(struct xe_gt *gt)
10661066
xe_gt_assert(gt, gt_to_xe(gt)->wedged.mode);
10671067

10681068
xe_uc_declare_wedged(&gt->uc);
1069-
xe_gt_tlb_invalidation_reset(gt);
1069+
xe_gt_tlb_inval_reset(gt);
10701070
}

drivers/gpu/drm/xe/xe_gt_pagefault.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "xe_gt.h"
1717
#include "xe_gt_printk.h"
1818
#include "xe_gt_stats.h"
19-
#include "xe_gt_tlb_invalidation.h"
2019
#include "xe_guc.h"
2120
#include "xe_guc_ct.h"
2221
#include "xe_migrate.h"

0 commit comments

Comments
 (0)