Commit 37388c01 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: 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-3-jani.nikula@intel.com
parent ca3cfb9d

drivers/gpu/drm/i915/i915_drv.h

+24 −21
Original line number Diff line number Diff line
@@ -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;