Commit 06d06064 authored by Matt Roper's avatar Matt Roper Committed by Rodrigo Vivi

drm/xe/irq: Drop gen3_ prefixes

"Gen" terminology should be avoided in the Xe driver and "gen3" refers
to platforms that are 9 (!!) graphics generations earlier than the
oldest supported by the Xe driver, so this prefix really doesn't make
sense.
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20230401002106.588656-2-matthew.d.roper@intel.comSigned-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 1a545ed7
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "xe_hw_engine.h" #include "xe_hw_engine.h"
#include "xe_mmio.h" #include "xe_mmio.h"
static void gen3_assert_iir_is_zero(struct xe_gt *gt, i915_reg_t reg) static void assert_iir_is_zero(struct xe_gt *gt, i915_reg_t reg)
{ {
u32 val = xe_mmio_read32(gt, reg.reg); u32 val = xe_mmio_read32(gt, reg.reg);
...@@ -34,24 +34,24 @@ static void gen3_assert_iir_is_zero(struct xe_gt *gt, i915_reg_t reg) ...@@ -34,24 +34,24 @@ static void gen3_assert_iir_is_zero(struct xe_gt *gt, i915_reg_t reg)
xe_mmio_read32(gt, reg.reg); xe_mmio_read32(gt, reg.reg);
} }
static void gen3_irq_init(struct xe_gt *gt, static void irq_init(struct xe_gt *gt,
i915_reg_t imr, u32 imr_val, i915_reg_t imr, u32 imr_val,
i915_reg_t ier, u32 ier_val, i915_reg_t ier, u32 ier_val,
i915_reg_t iir) i915_reg_t iir)
{ {
gen3_assert_iir_is_zero(gt, iir); assert_iir_is_zero(gt, iir);
xe_mmio_write32(gt, ier.reg, ier_val); xe_mmio_write32(gt, ier.reg, ier_val);
xe_mmio_write32(gt, imr.reg, imr_val); xe_mmio_write32(gt, imr.reg, imr_val);
xe_mmio_read32(gt, imr.reg); xe_mmio_read32(gt, imr.reg);
} }
#define GEN3_IRQ_INIT(gt, type, imr_val, ier_val) \ #define IRQ_INIT(gt, type, imr_val, ier_val) \
gen3_irq_init((gt), \ irq_init((gt), \
type##IMR, imr_val, \ type##IMR, imr_val, \
type##IER, ier_val, \ type##IER, ier_val, \
type##IIR) type##IIR)
static void gen3_irq_reset(struct xe_gt *gt, i915_reg_t imr, i915_reg_t iir, static void irq_reset(struct xe_gt *gt, i915_reg_t imr, i915_reg_t iir,
i915_reg_t ier) i915_reg_t ier)
{ {
xe_mmio_write32(gt, imr.reg, 0xffffffff); xe_mmio_write32(gt, imr.reg, 0xffffffff);
...@@ -65,8 +65,8 @@ static void gen3_irq_reset(struct xe_gt *gt, i915_reg_t imr, i915_reg_t iir, ...@@ -65,8 +65,8 @@ static void gen3_irq_reset(struct xe_gt *gt, i915_reg_t imr, i915_reg_t iir,
xe_mmio_write32(gt, iir.reg, 0xffffffff); xe_mmio_write32(gt, iir.reg, 0xffffffff);
xe_mmio_read32(gt, iir.reg); xe_mmio_read32(gt, iir.reg);
} }
#define GEN3_IRQ_RESET(gt, type) \ #define IRQ_RESET(gt, type) \
gen3_irq_reset((gt), type##IMR, type##IIR, type##IER) irq_reset((gt), type##IMR, type##IIR, type##IER)
static u32 gen11_intr_disable(struct xe_gt *gt) static u32 gen11_intr_disable(struct xe_gt *gt)
{ {
...@@ -172,8 +172,7 @@ static void gen11_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) ...@@ -172,8 +172,7 @@ static void gen11_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
gen11_gt_irq_postinstall(xe, gt); gen11_gt_irq_postinstall(xe, gt);
GEN3_IRQ_INIT(gt, GEN11_GU_MISC_, ~GEN11_GU_MISC_GSE, IRQ_INIT(gt, GEN11_GU_MISC_, ~GEN11_GU_MISC_GSE, GEN11_GU_MISC_GSE);
GEN11_GU_MISC_GSE);
gen11_intr_enable(gt, true); gen11_intr_enable(gt, true);
} }
...@@ -332,8 +331,7 @@ static void dg1_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) ...@@ -332,8 +331,7 @@ static void dg1_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
{ {
gen11_gt_irq_postinstall(xe, gt); gen11_gt_irq_postinstall(xe, gt);
GEN3_IRQ_INIT(gt, GEN11_GU_MISC_, ~GEN11_GU_MISC_GSE, IRQ_INIT(gt, GEN11_GU_MISC_, ~GEN11_GU_MISC_GSE, GEN11_GU_MISC_GSE);
GEN11_GU_MISC_GSE);
if (gt->info.id == XE_GT0) if (gt->info.id == XE_GT0)
dg1_intr_enable(xe, true); dg1_intr_enable(xe, true);
...@@ -434,8 +432,8 @@ static void gen11_irq_reset(struct xe_gt *gt) ...@@ -434,8 +432,8 @@ static void gen11_irq_reset(struct xe_gt *gt)
gen11_gt_irq_reset(gt); gen11_gt_irq_reset(gt);
GEN3_IRQ_RESET(gt, GEN11_GU_MISC_); IRQ_RESET(gt, GEN11_GU_MISC_);
GEN3_IRQ_RESET(gt, GEN8_PCU_); IRQ_RESET(gt, GEN8_PCU_);
} }
static void dg1_irq_reset(struct xe_gt *gt) static void dg1_irq_reset(struct xe_gt *gt)
...@@ -445,8 +443,8 @@ static void dg1_irq_reset(struct xe_gt *gt) ...@@ -445,8 +443,8 @@ static void dg1_irq_reset(struct xe_gt *gt)
gen11_gt_irq_reset(gt); gen11_gt_irq_reset(gt);
GEN3_IRQ_RESET(gt, GEN11_GU_MISC_); IRQ_RESET(gt, GEN11_GU_MISC_);
GEN3_IRQ_RESET(gt, GEN8_PCU_); IRQ_RESET(gt, GEN8_PCU_);
} }
static void xe_irq_reset(struct xe_device *xe) static void xe_irq_reset(struct xe_device *xe)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment