diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 14e516fdc2dd..2b3fa7a3c028 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
| @@ -607,53 +607,6 @@ static void intel_lvds_mode_set(struct drm_encoder *encoder, | |||
| 607 | I915_WRITE(PFIT_CONTROL, lvds_priv->pfit_control); | 607 | I915_WRITE(PFIT_CONTROL, lvds_priv->pfit_control); |
| 608 | } | 608 | } |
| 609 | 609 | ||
| 610 | /* Some lid devices report incorrect lid status, assume they're connected */ | ||
| 611 | static const struct dmi_system_id bad_lid_status[] = { | ||
| 612 | { | ||
| 613 | .ident = "Compaq nx9020", | ||
| 614 | .matches = { | ||
| 615 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 616 | DMI_MATCH(DMI_BOARD_NAME, "3084"), | ||
| 617 | }, | ||
| 618 | }, | ||
| 619 | { | ||
| 620 | .ident = "Samsung SX20S", | ||
| 621 | .matches = { | ||
| 622 | DMI_MATCH(DMI_SYS_VENDOR, "Samsung Electronics"), | ||
| 623 | DMI_MATCH(DMI_BOARD_NAME, "SX20S"), | ||
| 624 | }, | ||
| 625 | }, | ||
| 626 | { | ||
| 627 | .ident = "Aspire One", | ||
| 628 | .matches = { | ||
| 629 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
| 630 | DMI_MATCH(DMI_PRODUCT_NAME, "Aspire one"), | ||
| 631 | }, | ||
| 632 | }, | ||
| 633 | { | ||
| 634 | .ident = "Aspire 1810T", | ||
| 635 | .matches = { | ||
| 636 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
| 637 | DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1810T"), | ||
| 638 | }, | ||
| 639 | }, | ||
| 640 | { | ||
| 641 | .ident = "PC-81005", | ||
| 642 | .matches = { | ||
| 643 | DMI_MATCH(DMI_SYS_VENDOR, "MALATA"), | ||
| 644 | DMI_MATCH(DMI_PRODUCT_NAME, "PC-81005"), | ||
| 645 | }, | ||
| 646 | }, | ||
| 647 | { | ||
| 648 | .ident = "Clevo M5x0N", | ||
| 649 | .matches = { | ||
| 650 | DMI_MATCH(DMI_SYS_VENDOR, "CLEVO Co."), | ||
| 651 | DMI_MATCH(DMI_BOARD_NAME, "M5x0N"), | ||
| 652 | }, | ||
| 653 | }, | ||
| 654 | { } | ||
| 655 | }; | ||
| 656 | |||
| 657 | /** | 610 | /** |
| 658 | * Detect the LVDS connection. | 611 | * Detect the LVDS connection. |
| 659 | * | 612 | * |
| @@ -669,12 +622,9 @@ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connect | |||
| 669 | /* ACPI lid methods were generally unreliable in this generation, so | 622 | /* ACPI lid methods were generally unreliable in this generation, so |
| 670 | * don't even bother. | 623 | * don't even bother. |
| 671 | */ | 624 | */ |
| 672 | if (IS_GEN2(dev)) | 625 | if (IS_GEN2(dev) || IS_GEN3(dev)) |
| 673 | return connector_status_connected; | 626 | return connector_status_connected; |
| 674 | 627 | ||
| 675 | if (!dmi_check_system(bad_lid_status) && !acpi_lid_open()) | ||
| 676 | status = connector_status_disconnected; | ||
| 677 | |||
| 678 | return status; | 628 | return status; |
| 679 | } | 629 | } |
| 680 | 630 | ||
