On Fri, Apr 12, 2024 at 05:52:53PM +0300, Jani Nikula wrote: > There are too few registers to warrant a dedicated file for LPE audio > regs, but the audio reg file is better than i915_reg.h. > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_audio_regs.h | 16 ++++++++++++++++ > drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- > drivers/gpu/drm/i915/i915_reg.h | 16 ---------------- > 3 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_audio_regs.h b/drivers/gpu/drm/i915/display/intel_audio_regs.h > index 616e7b1275c4..7a6d919481fc 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio_regs.h > +++ b/drivers/gpu/drm/i915/display/intel_audio_regs.h > @@ -148,4 +148,20 @@ > #define HBLANK_START_COUNT_96 4 > #define HBLANK_START_COUNT_128 5 > > +/* LPE Audio */ > +#define I915_HDMI_LPE_AUDIO_BASE (VLV_DISPLAY_BASE + 0x65000) > +#define I915_HDMI_LPE_AUDIO_SIZE 0x1000 > + > +#define VLV_AUD_CHICKEN_BIT_REG _MMIO(VLV_DISPLAY_BASE + 0x62f38) > +#define VLV_CHICKEN_BIT_DBG_ENABLE REG_BIT(0) > + > +#define _VLV_AUD_PORT_EN_B_DBG (VLV_DISPLAY_BASE + 0x62f20) > +#define _VLV_AUD_PORT_EN_C_DBG (VLV_DISPLAY_BASE + 0x62f30) > +#define _VLV_AUD_PORT_EN_D_DBG (VLV_DISPLAY_BASE + 0x62f34) > +#define VLV_AUD_PORT_EN_DBG(port) _MMIO_PORT3((port) - PORT_B, \ > + _VLV_AUD_PORT_EN_B_DBG, \ > + _VLV_AUD_PORT_EN_C_DBG, \ > + _VLV_AUD_PORT_EN_D_DBG) > +#define VLV_AMP_MUTE REG_BIT(1) > + > #endif /* __INTEL_AUDIO_REGS_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c > index 5863763de530..93e6cac9a4ed 100644 > --- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c > +++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c > @@ -72,7 +72,7 @@ > > #include "i915_drv.h" > #include "i915_irq.h" > -#include "i915_reg.h" > +#include "intel_audio_regs.h" > #include "intel_de.h" > #include "intel_lpe_audio.h" > #include "intel_pci_config.h" > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 3f34efcd7d6c..c689bc7e2867 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -1228,22 +1228,6 @@ > #define I915_ASLE_INTERRUPT (1 << 0) > #define I915_BSD_USER_INTERRUPT (1 << 25) > > -#define I915_HDMI_LPE_AUDIO_BASE (VLV_DISPLAY_BASE + 0x65000) > -#define I915_HDMI_LPE_AUDIO_SIZE 0x1000 > - > -/* DisplayPort Audio w/ LPE */ > -#define VLV_AUD_CHICKEN_BIT_REG _MMIO(VLV_DISPLAY_BASE + 0x62F38) > -#define VLV_CHICKEN_BIT_DBG_ENABLE (1 << 0) > - > -#define _VLV_AUD_PORT_EN_B_DBG (VLV_DISPLAY_BASE + 0x62F20) > -#define _VLV_AUD_PORT_EN_C_DBG (VLV_DISPLAY_BASE + 0x62F30) > -#define _VLV_AUD_PORT_EN_D_DBG (VLV_DISPLAY_BASE + 0x62F34) > -#define VLV_AUD_PORT_EN_DBG(port) _MMIO_PORT3((port) - PORT_B, \ > - _VLV_AUD_PORT_EN_B_DBG, \ > - _VLV_AUD_PORT_EN_C_DBG, \ > - _VLV_AUD_PORT_EN_D_DBG) > -#define VLV_AMP_MUTE (1 << 1) > - > #define GEN6_BSD_RNCID _MMIO(0x12198) > > #define GEN7_FF_THREAD_MODE _MMIO(0x20a0) > -- > 2.39.2 -- Ville Syrjälä Intel
