Commit 20be551e authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Reorganize intel_lpe_audio_notify() arguments

Shuffle the arguments to intel_lpe_audio_notify() around a bit. Pipe
and port being the most important things, so let's put the first, and
thre rest can come in as is. Also constify the eld argument.

Cc: Takashi Iwai <tiwai@suse.de>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170427160231.13337-8-ville.syrjala@linux.intel.comReviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 265fa2e1
...@@ -3721,8 +3721,8 @@ int intel_lpe_audio_init(struct drm_i915_private *dev_priv); ...@@ -3721,8 +3721,8 @@ int intel_lpe_audio_init(struct drm_i915_private *dev_priv);
void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv); void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv); void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
void intel_lpe_audio_notify(struct drm_i915_private *dev_priv, void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
void *eld, int port, int pipe, int ls_clock, enum pipe pipe, enum port port,
bool dp_output); const void *eld, int ls_clock, bool dp_output);
/* intel_i2c.c */ /* intel_i2c.c */
extern int intel_setup_gmbus(struct drm_i915_private *dev_priv); extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
......
...@@ -632,7 +632,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder, ...@@ -632,7 +632,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
(int) port, (int) pipe); (int) port, (int) pipe);
} }
intel_lpe_audio_notify(dev_priv, connector->eld, port, pipe, intel_lpe_audio_notify(dev_priv, pipe, port, connector->eld,
crtc_state->port_clock, crtc_state->port_clock,
intel_encoder->type == INTEL_OUTPUT_DP); intel_encoder->type == INTEL_OUTPUT_DP);
} }
...@@ -669,7 +669,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) ...@@ -669,7 +669,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
(int) port, (int) pipe); (int) port, (int) pipe);
} }
intel_lpe_audio_notify(dev_priv, NULL, port, pipe, 0, false); intel_lpe_audio_notify(dev_priv, pipe, port, NULL, 0, false);
} }
/** /**
......
...@@ -307,17 +307,17 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv) ...@@ -307,17 +307,17 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
* intel_lpe_audio_notify() - notify lpe audio event * intel_lpe_audio_notify() - notify lpe audio event
* audio driver and i915 * audio driver and i915
* @dev_priv: the i915 drm device private data * @dev_priv: the i915 drm device private data
* @pipe: pipe
* @port: port
* @eld : ELD data * @eld : ELD data
* @pipe: pipe id
* @port: port id
* @ls_clock: Link symbol clock in kHz * @ls_clock: Link symbol clock in kHz
* @dp_output: Driving a DP output? * @dp_output: Driving a DP output?
* *
* Notify lpe audio driver of eld change. * Notify lpe audio driver of eld change.
*/ */
void intel_lpe_audio_notify(struct drm_i915_private *dev_priv, void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
void *eld, int port, int pipe, int ls_clock, enum pipe pipe, enum port port,
bool dp_output) const void *eld, int ls_clock, bool dp_output)
{ {
unsigned long irq_flags; unsigned long irq_flags;
struct intel_hdmi_lpe_audio_pdata *pdata = NULL; struct intel_hdmi_lpe_audio_pdata *pdata = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment