diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2013-03-01 13:14:31 -0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-06 22:05:09 +0100 |
| commit | 35aad75fd3afed550c42f5f5148d11c8c345f57d (patch) | |
| tree | f6b0f9969d2cedee19943255f4b84a95d6d6789b | |
| parent | 086ddccec43be12fdf58f5ac6bbcd75d9d20d639 (diff) | |
drm/i915/dp: add pre-PCH eDP checking to DP detect for VLVdrm-intel-next-2013-03-07
Allows us to detect eDP panels that may not have the hotplug pin wired up.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 843f7a502cf..3921d879a91 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2258,6 +2258,16 @@ g4x_dp_detect(struct intel_dp *intel_dp) struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); uint32_t bit; + /* Can't disconnect eDP, but you can close the lid... */ + if (is_edp(intel_dp)) { + enum drm_connector_status status; + + status = intel_panel_detect(dev); + if (status == connector_status_unknown) + status = connector_status_connected; + return status; + } + switch (intel_dig_port->port) { case PORT_B: bit = PORTB_HOTPLUG_LIVE_STATUS; |