Commit fe9b286b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/audio: group audio under anonymous struct in drm_i915_private 



With an anonymous struct, this can be pure hierarchical organization
without code changes. We'll follow up with adding a name to the
sub-struct separately.

Cc: Dave Airlie <airlied@redhat.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211104161858.21786-1-jani.nikula@intel.com
parent c64a9a7c

drivers/gpu/drm/i915/i915_drv.h

+22 −21
Original line number Diff line number Diff line
@@ -995,9 +995,6 @@ struct drm_i915_private { 
	/* Display internal color functions */

	const struct intel_color_funcs *color_funcs;



	/* Display internal audio functions */

	const struct intel_audio_funcs *audio_funcs;



	/* Display CDCLK functions */

	const struct intel_cdclk_funcs *cdclk_funcs;
@@ -1084,17 +1081,6 @@ struct drm_i915_private { 
	struct drm_property *broadcast_rgb_property;

	struct drm_property *force_audio_property;



	/* hda/i915 audio component */

	struct i915_audio_component *audio_component;

	bool audio_component_registered;

	/**

	 * av_mutex - mutex for audio/video sync

	 *

	 */

	struct mutex av_mutex;

	int audio_power_refcount;

	u32 audio_freq_cntrl;



	u32 fdi_rx_config;



	/* Shadow for DISPLAY_PHY_CONTROL which can't be safely read */
@@ -1227,6 +1213,20 @@ struct drm_i915_private { 


	bool ipc_enabled;



	struct {

		/* Display internal audio functions */

		const struct intel_audio_funcs *audio_funcs;



		/* hda/i915 audio component */

		struct i915_audio_component *audio_component;

		bool audio_component_registered;

		/**

		 * av_mutex - mutex for audio/video sync

		 */

		struct mutex av_mutex;

		int audio_power_refcount;

		u32 audio_freq_cntrl;



		/* Used to save the pipe-to-encoder mapping for audio */

		struct intel_encoder *av_enc_map[I915_MAX_PIPES];
@@ -1235,6 +1235,7 @@ struct drm_i915_private { 
			struct platform_device *platdev;

			int irq;

		} lpe_audio;

	};



	struct i915_pmu pmu;