diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-11-08 13:55:38 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-11-09 13:55:05 +0100 |
| commit | bbf35e9defb9a6d1564dd56c7d113f07b9799873 (patch) | |
| tree | 2a18393bb072090dbcf7c56775a96e005e0824cd /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | df18e721a6140d042b3c284b9bef04ffc2f631e4 (diff) | |
| download | op-kernel-dev-bbf35e9defb9a6d1564dd56c7d113f07b9799873.zip op-kernel-dev-bbf35e9defb9a6d1564dd56c7d113f07b9799873.tar.gz | |
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1478609742-13603-8-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 2218b10..fb88e32 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -984,7 +984,7 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder, WARN_ON(!crtc->config->has_hdmi_sink); DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n", 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, |
