drm/i915/tv: only call intel_tv_init() on platforms that might have TV

With most platforms not having TV support, only call intel_tv_init() on
platforms that might actually have TV, specifically gens 3 and 4.

This puts intel_tv_init() more in line with the rest of the outputs, and
makes it slightly easier for the uninitiated to figure out which
platforms actually have what.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190122082307.4003-4-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index db0f15242ccfedc0b1061528b865552992fb7fca..8e89f04ddd9c0446f85b7999f488e075046742a5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14504,6 +14504,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 
                if (IS_G4X(dev_priv) && (I915_READ(DP_D) & DP_DETECTED))
                        intel_dp_init(dev_priv, DP_D, PORT_D);
+
+               if (SUPPORTS_TV(dev_priv))
+                       intel_tv_init(dev_priv);
        } else if (IS_GEN(dev_priv, 2)) {
                if (IS_MOBILE(dev_priv) && !IS_I830(dev_priv))
                        intel_lvds_init(dev_priv);
@@ -14514,9 +14517,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
                intel_dvo_init(dev_priv);
        }
 
-       if (SUPPORTS_TV(dev_priv))
-               intel_tv_init(dev_priv);
-
        intel_psr_init(dev_priv);
 
        for_each_intel_encoder(&dev_priv->drm, encoder) {