diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 9177c17853e5..f6a72cbb152d 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
@@ -453,7 +453,8 @@ static void intel_lvds_mode_set(struct drm_encoder *encoder, | |||
453 | * connected and closed means disconnected. We also send hotplug events as | 453 | * connected and closed means disconnected. We also send hotplug events as |
454 | * needed, using lid status notification from the input layer. | 454 | * needed, using lid status notification from the input layer. |
455 | */ | 455 | */ |
456 | static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector) | 456 | static enum drm_connector_status |
457 | intel_lvds_detect(struct drm_connector *connector, bool force) | ||
457 | { | 458 | { |
458 | struct drm_device *dev = connector->dev; | 459 | struct drm_device *dev = connector->dev; |
459 | enum drm_connector_status status = connector_status_connected; | 460 | enum drm_connector_status status = connector_status_connected; |
@@ -534,7 +535,9 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, | |||
534 | * the LID nofication event. | 535 | * the LID nofication event. |
535 | */ | 536 | */ |
536 | if (connector) | 537 | if (connector) |
537 | connector->status = connector->funcs->detect(connector); | 538 | connector->status = connector->funcs->detect(connector, |
539 | false); | ||
540 | |||
538 | /* Don't force modeset on machines where it causes a GPU lockup */ | 541 | /* Don't force modeset on machines where it causes a GPU lockup */ |
539 | if (dmi_check_system(intel_no_modeset_on_lid)) | 542 | if (dmi_check_system(intel_no_modeset_on_lid)) |
540 | return NOTIFY_OK; | 543 | return NOTIFY_OK; |