Skip to content

Commit 401fabd

Browse files
committed
drm/xe/mert: Use local mert variable to simplify the code
There is no need to always refer to MERT data using tile pointer. Use of local mert pointer will simplify the code and make it look like other existing MERT function. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Lukasz Laguna <lukasz.laguna@intel.com> Reviewed-by: Lukasz Laguna <lukasz.laguna@intel.com> Link: https://patch.msgid.link/20260109151219.26206-5-michal.wajdeczko@intel.com
1 parent ff4eca1 commit 401fabd

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/gpu/drm/xe/xe_mert.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ int xe_mert_invalidate_lmtt(struct xe_device *xe)
5252
void xe_mert_irq_handler(struct xe_device *xe, u32 master_ctl)
5353
{
5454
struct xe_tile *tile = xe_device_get_root_tile(xe);
55+
struct xe_mert *mert = &tile->mert;
5556
unsigned long flags;
5657
u32 reg_val;
5758
u8 err;
@@ -69,13 +70,13 @@ void xe_mert_irq_handler(struct xe_device *xe, u32 master_ctl)
6970
else if (err)
7071
drm_dbg(&xe->drm, "MERT catastrophic error: Unexpected fault (0x%x)\n", err);
7172

72-
spin_lock_irqsave(&tile->mert.lock, flags);
73-
if (tile->mert.tlb_inv_triggered) {
73+
spin_lock_irqsave(&mert->lock, flags);
74+
if (mert->tlb_inv_triggered) {
7475
reg_val = xe_mmio_read32(&tile->mmio, MERT_TLB_INV_DESC_A);
7576
if (!(reg_val & MERT_TLB_INV_DESC_A_VALID)) {
76-
tile->mert.tlb_inv_triggered = false;
77-
complete_all(&tile->mert.tlb_inv_done);
77+
mert->tlb_inv_triggered = false;
78+
complete_all(&mert->tlb_inv_done);
7879
}
7980
}
80-
spin_unlock_irqrestore(&tile->mert.lock, flags);
81+
spin_unlock_irqrestore(&mert->lock, flags);
8182
}

0 commit comments

Comments
 (0)