drm/i915/lvds: nuke intel_lvds_supported()

Now that intel_lvds_init() is only called for platforms that might have
LVDS, move the remaining checks to intel_setup_outputs(), again similar
to other outputs, and remove the overlapping checks.

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-3-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 29a7dd4afe0e7d8a5aa9487001269d08bec77d9d..db0f15242ccfedc0b1061528b865552992fb7fca 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14467,7 +14467,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
        } else if (IS_GEN_RANGE(dev_priv, 3, 4)) {
                bool found = false;
 
-               intel_lvds_init(dev_priv);
+               if (IS_MOBILE(dev_priv))
+                       intel_lvds_init(dev_priv);
 
                if (dev_priv->vbt.int_crt_support)
                        intel_crt_init(dev_priv);
@@ -14504,7 +14505,8 @@ 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);
        } else if (IS_GEN(dev_priv, 2)) {
-               intel_lvds_init(dev_priv);
+               if (IS_MOBILE(dev_priv) && !IS_I830(dev_priv))
+                       intel_lvds_init(dev_priv);
 
                if (dev_priv->vbt.int_crt_support)
                        intel_crt_init(dev_priv);

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 46a5dfd5cdf7a76dd0bc9499bbc71e955971e4d7..815ed463d9c5411e95907ce7fc6f9d4b254307cc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -798,26 +798,6 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
        return (val & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP;
 }
 
-static bool intel_lvds_supported(struct drm_i915_private *dev_priv)
-{
-       /*
-        * With the introduction of the PCH we gained a dedicated
-        * LVDS presence pin, use it.
-        */
-       if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
-               return true;
-
-       /*
-        * Otherwise LVDS was only attached to mobile products,
-        * except for the inglorious 830gm
-        */
-       if (INTEL_GEN(dev_priv) <= 4 &&
-           IS_MOBILE(dev_priv) && !IS_I830(dev_priv))
-               return true;
-
-       return false;
-}
-
 /**
  * intel_lvds_init - setup LVDS connectors on this device
  * @dev_priv: i915 device
@@ -842,9 +822,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
        u8 pin;
        u32 allowed_scalers;
 
-       if (!intel_lvds_supported(dev_priv))
-               return;
-
        /* Skip init on machines we know falsely report LVDS */
        if (dmi_check_system(intel_no_lvds)) {
                WARN(!dev_priv->vbt.int_lvds_support,