drm/i915/audio: move LPE audio regs to intel_audio_regs.h

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.

v2: Rebase

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b5ee35309b2e0905aaa12d944b3d379c45a8a0bd.1714128645.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_audio_regs.h b/drivers/gpu/drm/i915/display/intel_audio_regs.h
index 616e7b1275c4c5b18732d920e34c9a151e1c16e6..88ea2740365d67a37bd0db690f211cacc7d03b48 100644 (file)
--- 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     (1 << 0)
+
+#define _VLV_AUD_PORT_EN_B_DBG         0x62F20
+#define _VLV_AUD_PORT_EN_C_DBG         0x62F30
+#define _VLV_AUD_PORT_EN_D_DBG         0x62F34
+#define VLV_AUD_PORT_EN_DBG(port)      _MMIO_BASE_PORT3(VLV_DISPLAY_BASE, (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)
+
 #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 5863763de5306e5556ed2f64fc676300a2400021..93e6cac9a4eda3ddc237b1e90855abb5d358c0e8 100644 (file)
--- 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 4eb37f38d8884caebd96eba498b1c642a2d06faf..4913b9a371c09fba3f2855b7c44b2aa89cbfc8b9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -966,22 +966,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         0x62F20
-#define _VLV_AUD_PORT_EN_C_DBG         0x62F30
-#define _VLV_AUD_PORT_EN_D_DBG         0x62F34
-#define VLV_AUD_PORT_EN_DBG(port)      _MMIO_BASE_PORT3(VLV_DISPLAY_BASE, (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)