Commit bbf35e9d authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Pass atomic state to intel_audio_codec_enable, v2.

drm_select_eld requires mode_config.mutex and connection_mutex
because it looks at the connector list and at the legacy encoders.

This is not required, because when we call audio_codec_enable we know
which connector it was called for, so pass the state.

This also removes having to look at crtc->config.

Changes since v1:
- Use intel_crtc->pipe instead of drm_crtc_index. (Ville)
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1478609742-13603-8-git-send-email-maarten.lankhorst@linux.intel.comReviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent df18e721
...@@ -574,23 +574,26 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, ...@@ -574,23 +574,26 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
/** /**
* intel_audio_codec_enable - Enable the audio codec for HD audio * intel_audio_codec_enable - Enable the audio codec for HD audio
* @intel_encoder: encoder on which to enable audio * @intel_encoder: encoder on which to enable audio
* @crtc_state: pointer to the current crtc state.
* @conn_state: pointer to the current connector state.
* *
* The enable sequences may only be performed after enabling the transcoder and * The enable sequences may only be performed after enabling the transcoder and
* port, and after completed link training. * port, and after completed link training.
*/ */
void intel_audio_codec_enable(struct intel_encoder *intel_encoder) void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
{ {
struct drm_encoder *encoder = &intel_encoder->base; struct drm_encoder *encoder = &intel_encoder->base;
struct intel_crtc *crtc = to_intel_crtc(encoder->crtc); const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;
const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_i915_private *dev_priv = to_i915(encoder->dev); struct drm_i915_private *dev_priv = to_i915(encoder->dev);
struct i915_audio_component *acomp = dev_priv->audio_component; struct i915_audio_component *acomp = dev_priv->audio_component;
enum port port = intel_encoder->port; enum port port = intel_encoder->port;
enum pipe pipe = crtc->pipe; enum pipe pipe = to_intel_crtc(crtc_state->base.crtc)->pipe;
connector = drm_select_eld(encoder); connector = conn_state->connector;
if (!connector) if (!connector || !connector->eld[0])
return; return;
DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n", DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
...@@ -601,7 +604,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) ...@@ -601,7 +604,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
/* ELD Conn_Type */ /* ELD Conn_Type */
connector->eld[5] &= ~(3 << 2); connector->eld[5] &= ~(3 << 2);
if (intel_crtc_has_dp_encoder(crtc->config)) if (intel_crtc_has_dp_encoder(crtc_state))
connector->eld[5] |= (1 << 2); connector->eld[5] |= (1 << 2);
connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2; connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
......
...@@ -1866,7 +1866,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder, ...@@ -1866,7 +1866,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,
if (intel_crtc->config->has_audio) { if (intel_crtc->config->has_audio) {
intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO); intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
intel_audio_codec_enable(intel_encoder); intel_audio_codec_enable(intel_encoder, pipe_config, conn_state);
} }
} }
......
...@@ -2735,7 +2735,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp, ...@@ -2735,7 +2735,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp,
} }
static void intel_enable_dp(struct intel_encoder *encoder, static void intel_enable_dp(struct intel_encoder *encoder,
struct intel_crtc_state *pipe_config) struct intel_crtc_state *pipe_config,
struct drm_connector_state *conn_state)
{ {
struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
struct drm_device *dev = encoder->base.dev; struct drm_device *dev = encoder->base.dev;
...@@ -2777,7 +2778,7 @@ static void intel_enable_dp(struct intel_encoder *encoder, ...@@ -2777,7 +2778,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,
if (pipe_config->has_audio) { if (pipe_config->has_audio) {
DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n", DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",
pipe_name(pipe)); pipe_name(pipe));
intel_audio_codec_enable(encoder); intel_audio_codec_enable(encoder, pipe_config, conn_state);
} }
} }
...@@ -2787,7 +2788,7 @@ static void g4x_enable_dp(struct intel_encoder *encoder, ...@@ -2787,7 +2788,7 @@ static void g4x_enable_dp(struct intel_encoder *encoder,
{ {
struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
intel_enable_dp(encoder, pipe_config); intel_enable_dp(encoder, pipe_config, conn_state);
intel_edp_backlight_on(intel_dp); intel_edp_backlight_on(intel_dp);
} }
...@@ -2924,7 +2925,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder, ...@@ -2924,7 +2925,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder,
{ {
vlv_phy_pre_encoder_enable(encoder); vlv_phy_pre_encoder_enable(encoder);
intel_enable_dp(encoder, pipe_config); intel_enable_dp(encoder, pipe_config, conn_state);
} }
static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder, static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder,
...@@ -2942,7 +2943,7 @@ static void chv_pre_enable_dp(struct intel_encoder *encoder, ...@@ -2942,7 +2943,7 @@ static void chv_pre_enable_dp(struct intel_encoder *encoder,
{ {
chv_phy_pre_encoder_enable(encoder); chv_phy_pre_encoder_enable(encoder);
intel_enable_dp(encoder, pipe_config); intel_enable_dp(encoder, pipe_config, conn_state);
/* Second common lane will stay alive on its own now */ /* Second common lane will stay alive on its own now */
chv_phy_release_cl2_override(encoder); chv_phy_release_cl2_override(encoder);
......
...@@ -1187,7 +1187,9 @@ u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv, ...@@ -1187,7 +1187,9 @@ u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv,
/* intel_audio.c */ /* intel_audio.c */
void intel_init_audio_hooks(struct drm_i915_private *dev_priv); void intel_init_audio_hooks(struct drm_i915_private *dev_priv);
void intel_audio_codec_enable(struct intel_encoder *encoder); void intel_audio_codec_enable(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state);
void intel_audio_codec_disable(struct intel_encoder *encoder); void intel_audio_codec_disable(struct intel_encoder *encoder);
void i915_audio_component_init(struct drm_i915_private *dev_priv); void i915_audio_component_init(struct drm_i915_private *dev_priv);
void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);
......
...@@ -984,7 +984,7 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder, ...@@ -984,7 +984,7 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder,
WARN_ON(!crtc->config->has_hdmi_sink); WARN_ON(!crtc->config->has_hdmi_sink);
DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n", DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n",
pipe_name(crtc->pipe)); pipe_name(crtc->pipe));
intel_audio_codec_enable(encoder); intel_audio_codec_enable(encoder, pipe_config, conn_state);
} }
static void g4x_enable_hdmi(struct intel_encoder *encoder, static void g4x_enable_hdmi(struct intel_encoder *encoder,
......
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