drm/i915: stop killing pfit on i9xx

Nowadays (i.e. with Valleyview) we also have edp on non-PCH_SPLIT
platforms, so just checking for LVDS is not good enough.

Secondly we have full pfit pipe config tracking, so we'll correctly
disable the pfit as part of the initial modeset.

For fastboot we need a bit of work here to correctly kill unsupported
configs (if e.g. the pfit is used on anything else than the built-in
panel). But since that's not yet supported we don't need to worry.

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 10c3d56332f5..eeff28ec2ff4 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -877,7 +877,7 @@ static bool intel_lvds_supported(struct drm_device *dev)
  * Create the connector, register the LVDS DDC bus, and try to figure out what
  * modes we can display on the LVDS panel (if present).
  */
-bool intel_lvds_init(struct drm_device *dev)
+void intel_lvds_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_lvds_encoder *lvds_encoder;
@@ -895,35 +895,35 @@ bool intel_lvds_init(struct drm_device *dev)
         u8 pin;
 
         if (!intel_lvds_supported(dev))
-                return false;
+                return;
 
         /* Skip init on machines we know falsely report LVDS */
         if (dmi_check_system(intel_no_lvds))
-                return false;
+                return;
 
         pin = GMBUS_PORT_PANEL;
         if (!lvds_is_present_in_vbt(dev, &pin)) {
                 DRM_DEBUG_KMS("LVDS is not present in VBT\n");
-                return false;
+                return;
         }
 
         if (HAS_PCH_SPLIT(dev)) {
                 if ((I915_READ(PCH_LVDS) & LVDS_DETECTED) == 0)
-                        return false;
+                        return;
                 if (dev_priv->vbt.edp_support) {
                         DRM_DEBUG_KMS("disable LVDS for eDP support\n");
-                        return false;
+                        return;
                 }
         }
 
         lvds_encoder = kzalloc(sizeof(struct intel_lvds_encoder), GFP_KERNEL);
         if (!lvds_encoder)
-                return false;
+                return;
 
         lvds_connector = kzalloc(sizeof(struct intel_lvds_connector), GFP_KERNEL);
         if (!lvds_connector) {
                 kfree(lvds_encoder);
-                return false;
+                return;
         }
 
         lvds_encoder->attached_connector = lvds_connector;
@@ -1094,7 +1094,7 @@ out:
         intel_panel_init(&intel_connector->panel, fixed_mode);
         intel_panel_setup_backlight(connector);
 
-        return true;
+        return;
 
 failed:
         DRM_DEBUG_KMS("No LVDS modes found, disabling.\n");
@@ -1104,5 +1104,5 @@ failed:
                 drm_mode_destroy(dev, fixed_mode);
         kfree(lvds_encoder);
         kfree(lvds_connector);
-        return false;
+        return;
 }