drm/i915/audio: define the audio struct separately from drm_i915_private

Add a standalone definition of struct intel_audio_private, and note that
all of it is private to intel_audio.c.

v2: Rebase

Cc: Dave Airlie <airlied@redhat.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211104161858.21786-3-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f754c4bf75d3064bee806eda8e0ce0313393d7b1..8bb2275c819c0d00181ca3c50de44a4a5d1aa011 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -828,6 +828,29 @@ struct i915_selftest_stash {
        struct ida mock_region_instances;
 };
 
+/* intel_audio.c private */
+struct intel_audio_private {
+       /* Display internal audio functions */
+       const struct intel_audio_funcs *funcs;
+
+       /* hda/i915 audio component */
+       struct i915_audio_component *component;
+       bool component_registered;
+       /* mutex for audio/video sync */
+       struct mutex mutex;
+       int power_refcount;
+       u32 freq_cntrl;
+
+       /* Used to save the pipe-to-encoder mapping for audio */
+       struct intel_encoder *encoder_map[I915_MAX_PIPES];
+
+       /* necessary resource sharing with HDMI LPE audio driver. */
+       struct {
+               struct platform_device *platdev;
+               int irq;
+       } lpe;
+};
+
 struct drm_i915_private {
        struct drm_device drm;
 
@@ -1213,27 +1236,7 @@ struct drm_i915_private {
 
        bool ipc_enabled;
 
-       struct {
-               /* Display internal audio functions */
-               const struct intel_audio_funcs *funcs;
-
-               /* hda/i915 audio component */
-               struct i915_audio_component *component;
-               bool component_registered;
-               /* mutex for audio/video sync */
-               struct mutex mutex;
-               int power_refcount;
-               u32 freq_cntrl;
-
-               /* Used to save the pipe-to-encoder mapping for audio */
-               struct intel_encoder *encoder_map[I915_MAX_PIPES];
-
-               /* necessary resource sharing with HDMI LPE audio driver. */
-               struct {
-                       struct platform_device *platdev;
-                       int irq;
-               } lpe;
-       } audio;
+       struct intel_audio_private audio;
 
        struct i915_pmu pmu;