drm/i915: always update ELD connector type after get modes
authorJani Nikula <jani.nikula@intel.com>
Tue, 19 Sep 2017 15:38:13 +0000 (18:38 +0300)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 26 Sep 2017 16:14:20 +0000 (09:14 -0700)
commit2d8f63297b9f0b430c96329893667c0bfdcbd47e
tree897ef7fc03c3baa3ea2214b08645c5b2cbcedd47
parente365806ac289457263a133bd32df8df49897f612
drm/i915: always update ELD connector type after get modes

drm_edid_to_eld() initializes the connector ELD to zero, overwriting the
ELD connector type initialized in intel_audio_codec_enable(). If
userspace does getconnector and thus get_modes after modeset, a
subsequent audio component i915_audio_component_get_eld() call will
receive an ELD without the connector type properly set. It's fine for
HDMI, but screws up audio for DP.

Always set the ELD connector type at intel_connector_update_modes()
based on the connector type. We can drop the connector type update from
intel_audio_codec_enable().

Credits to Joseph Nuzman <jnuzman@gmail.com> for figuring this out.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Joseph Nuzman <jnuzman@gmail.com>
Reported-by: Joseph Nuzman <jnuzman@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101583
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Joseph Nuzman <jnuzman@gmail.com>
Cc: stable@vger.kernel.org # v4.10+, maybe earlier
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170919153813.29808-1-jani.nikula@intel.com
(cherry picked from commit d81fb7fd9436e81fda67e5bc8ed0713aa28d3db2)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/intel_audio.c
drivers/gpu/drm/i915/intel_modes.c