drm/i915: Track has_audio in the pipe config

Including state readout and cross-checking. This allows us to get rid
of crtc->eld_vld on hsw+. It also means that fastboot will be unhappy
if the BIOS hasn't set up the audio routing like we want it too.

Wrt fastboot and external screens I see a few options:
- Don't.
- Try to fix up eld, infoframes and audio settings after the fact. But
  that means some pretty extensive reworking of our code which
  currently does all this while the pipe/port is still off.

I won't bother with converting SDVO over to this because the audio
support for SDVO is very lacking:
- We don't update the eld.
- We don't update the audio state on the sdvo encoder.
- We don't check whether the platform can even feed audio to the sdvo
  encoder.

I've converted hdmi, dp & ddi all in one go since ddi needs both hdmi
and dp converted and so doing it step-by-step would have required a
few intermediate hacks.

Reviewed-by: Naresh Kumar Kachhi <naresh.kumar.kachhi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 9c9698583acf..0894ade01ab8 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -658,7 +658,7 @@ static void intel_hdmi_mode_set(struct intel_encoder *encoder)
         if (crtc->config.has_hdmi_sink)
                 hdmi_val |= HDMI_MODE_SELECT_HDMI;
 
-        if (intel_hdmi->has_audio) {
+        if (crtc->config.has_audio) {
                 WARN_ON(!crtc->config.has_hdmi_sink);
                 DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n",
                                  pipe_name(crtc->pipe));
@@ -726,6 +726,9 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
         if (tmp & HDMI_MODE_SELECT_HDMI)
                 pipe_config->has_hdmi_sink = true;
 
+        if (tmp & HDMI_MODE_SELECT_HDMI)
+                pipe_config->has_audio = true;
+
         pipe_config->adjusted_mode.flags |= flags;
 
         if ((tmp & SDVO_COLOR_FORMAT_MASK) == HDMI_COLOR_FORMAT_12bpc)
@@ -748,7 +751,7 @@ static void intel_enable_hdmi(struct intel_encoder *encoder)
         u32 temp;
         u32 enable_bits = SDVO_ENABLE;
 
-        if (intel_hdmi->has_audio)
+        if (intel_crtc->config.has_audio)
                 enable_bits |= SDVO_AUDIO_ENABLE;
 
         temp = I915_READ(intel_hdmi->hdmi_reg);
@@ -919,6 +922,9 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
         if (HAS_PCH_SPLIT(dev) && !HAS_DDI(dev))
                 pipe_config->has_pch_encoder = true;
 
+        if (pipe_config->has_hdmi_sink && intel_hdmi->has_audio)
+                pipe_config->has_audio = true;
+
         /*
          * HDMI is either 12 or 8, so if the display lets 10bpc sneak
          * through, clamp it down. Note that g4x/vlv don't support 12bpc hdmi