On Mon, Jan 10, 2022 at 09:15:52PM -0800, Matt Roper wrote: > Combine the separate render and blitter register definitions into a > single definition. We already know we have some workarounds on an > upcoming platform that will need to update the ECOSKPD register for > other engines too, so this helps pave the way for that. > > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx> > Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- > drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- > drivers/gpu/drm/i915/i915_reg.h | 14 ++++++-------- > drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- > 4 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index ab3277a3d593..2d87dc81cd63 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -2536,7 +2536,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) > * they are already accustomed to from before contexts were > * enabled. > */ > - wa_add(wal, ECOSKPD, > + wa_add(wal, ECOSKPD(RENDER_RING_BASE), > 0, _MASKED_BIT_ENABLE(ECO_CONSTANT_BUFFER_SR_DISABLE), > 0 /* XXX bit doesn't stick on Broadwater */, > true); > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c > index 3938df0db188..329d30a36f4f 100644 > --- a/drivers/gpu/drm/i915/gvt/handlers.c > +++ b/drivers/gpu/drm/i915/gvt/handlers.c > @@ -2877,9 +2877,9 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) > > MMIO_D(_MMIO(0x3c), D_ALL); > MMIO_D(_MMIO(0x860), D_ALL); > - MMIO_D(ECOSKPD, D_ALL); > + MMIO_D(ECOSKPD(RENDER_RING_BASE), D_ALL); > MMIO_D(_MMIO(0x121d0), D_ALL); > - MMIO_D(GEN6_BLITTER_ECOSKPD, D_ALL); > + MMIO_D(ECOSKPD(BLT_RING_BASE), D_ALL); > MMIO_D(_MMIO(0x41d0), D_ALL); > MMIO_D(GAC_ECO_BITS, D_ALL); > MMIO_D(_MMIO(0x6200), D_ALL); > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 3ef332833c4c..a4c9d2005c46 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2858,10 +2858,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define GFX_FLSH_CNTL _MMIO(0x2170) /* 915+ only */ > #define GFX_FLSH_CNTL_GEN6 _MMIO(0x101008) > #define GFX_FLSH_CNTL_EN (1 << 0) > -#define ECOSKPD _MMIO(0x21d0) > -#define ECO_CONSTANT_BUFFER_SR_DISABLE REG_BIT(4) > -#define ECO_GATING_CX_ONLY (1 << 3) > -#define ECO_FLIP_DONE (1 << 0) > +#define ECOSKPD(base) _MMIO((base) + 0x1d0) > +#define ECO_CONSTANT_BUFFER_SR_DISABLE REG_BIT(4) > +#define ECO_GATING_CX_ONLY REG_BIT(3) > +#define GEN6_BLITTER_FBC_NOTIFY REG_BIT(3) > +#define ECO_FLIP_DONE REG_BIT(0) > +#define GEN6_BLITTER_LOCK_SHIFT 16 This looks messy. The register contents are (mostly?) unique for each engine, so this is making it rather hard to see which register takes which bits. I think we should at least group the bits clearly based on which engine they belong to. > > #define CACHE_MODE_0_GEN7 _MMIO(0x7000) /* IVB+ */ > #define RC_OP_FLUSH_ENABLE (1 << 0) > @@ -2871,10 +2873,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define GEN8_4x4_STC_OPTIMIZATION_DISABLE (1 << 6) > #define GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE (1 << 1) > > -#define GEN6_BLITTER_ECOSKPD _MMIO(0x221d0) > -#define GEN6_BLITTER_LOCK_SHIFT 16 > -#define GEN6_BLITTER_FBC_NOTIFY (1 << 3) > - > #define GEN6_RC_SLEEP_PSMI_CONTROL _MMIO(0x2050) > #define GEN6_PSMI_SLEEP_MSG_DISABLE (1 << 0) > #define GEN12_WAIT_FOR_EVENT_POWER_DOWN_DISABLE REG_BIT(7) > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 8b357ec35a4a..2d0955d13776 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -7868,10 +7868,12 @@ static void gen3_init_clock_gating(struct drm_i915_private *dev_priv) > intel_uncore_write(&dev_priv->uncore, D_STATE, dstate); > > if (IS_PINEVIEW(dev_priv)) > - intel_uncore_write(&dev_priv->uncore, ECOSKPD, _MASKED_BIT_ENABLE(ECO_GATING_CX_ONLY)); > + intel_uncore_write(&dev_priv->uncore, ECOSKPD(RENDER_RING_BASE), > + _MASKED_BIT_ENABLE(ECO_GATING_CX_ONLY)); > > /* IIR "flip pending" means done if this bit is set */ > - intel_uncore_write(&dev_priv->uncore, ECOSKPD, _MASKED_BIT_DISABLE(ECO_FLIP_DONE)); > + intel_uncore_write(&dev_priv->uncore, ECOSKPD(RENDER_RING_BASE), > + _MASKED_BIT_DISABLE(ECO_FLIP_DONE)); > > /* interrupts should cause a wake up from C3 */ > intel_uncore_write(&dev_priv->uncore, INSTPM, _MASKED_BIT_ENABLE(INSTPM_AGPBUSY_INT_EN)); > -- > 2.34.1 -- Ville Syrjälä Intel
