drm/i915: make SDVO TV-out work for multifunction devices

We need to track this correctly. While at it shovel the boolean
to track whether the sdvo is in tv mode or not into pipe_config.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36997
Tested-by: Pierre Assal <pierre.assal@verint.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63609
Tested-by: cancan,feng <cancan.feng@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 0fc6fc2d6a30..015f9f4263fe 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1092,6 +1092,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
                 (void) intel_sdvo_get_preferred_input_mode(intel_sdvo,
                                                            mode,
                                                            adjusted_mode);
+                pipe_config->sdvo_tv_clock = true;
         } else if (intel_sdvo->is_lvds) {
                 if (!intel_sdvo_set_output_timings_from_mode(intel_sdvo,
                                                              intel_sdvo->sdvo_lvds_fixed_mode))
@@ -1655,12 +1656,9 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
         if (ret == connector_status_connected) {
                 intel_sdvo->is_tv = false;
                 intel_sdvo->is_lvds = false;
-                intel_sdvo->base.needs_tv_clock = false;
 
-                if (response & SDVO_TV_MASK) {
+                if (response & SDVO_TV_MASK)
                         intel_sdvo->is_tv = true;
-                        intel_sdvo->base.needs_tv_clock = true;
-                }
                 if (response & SDVO_LVDS_MASK)
                         intel_sdvo->is_lvds = intel_sdvo->sdvo_lvds_fixed_mode != NULL;
         }
@@ -2349,7 +2347,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
         intel_sdvo_connector->output_flag = type;
 
         intel_sdvo->is_tv = true;
-        intel_sdvo->base.needs_tv_clock = true;
 
         intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo);
 
@@ -2437,7 +2434,6 @@ static bool
 intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, uint16_t flags)
 {
         intel_sdvo->is_tv = false;
-        intel_sdvo->base.needs_tv_clock = false;
         intel_sdvo->is_lvds = false;
 
         /* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/