Skip to content

Commit

Permalink
drm/i915/audio: define the audio struct separately from drm_i915_private
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jani Nikula committed Nov 5, 2021
1 parent ca3cfb9 commit 37388c0
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 37388c0

Please sign in to comment.