drm/i915: Move the lvds OpRegion lid detection code to panel and reuse for eDP

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_dp.c

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index e478f6a94535b42f5311b0ee0336eb7742a36b72..65959a29ab2bd2c81f09be689a1396fe9094e08b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1522,9 +1522,13 @@ ironlake_dp_detect(struct intel_dp *intel_dp)
 {
        enum drm_connector_status status;
 
-       /* Can't disconnect eDP */
-       if (is_edp(intel_dp))
-               return connector_status_connected;
+       /* Can't disconnect eDP, but you can close the lid... */
+       if (is_edp(intel_dp)) {
+               status = intel_panel_detect(intel_dp->base.base.dev);
+               if (status == connector_status_unknown)
+                       status = connector_status_connected;
+               return status;
+       }
 
        status = connector_status_disconnected;
        if (intel_dp_aux_native_read(intel_dp,