| diff -uNr linux-4.1.3-vanilla/drivers/gpu/drm/i915/intel_dp.c linux-4.1.3/drivers/gpu/drm/i915/intel_dp.c | |
| --- linux-4.1.3-vanilla/drivers/gpu/drm/i915/intel_dp.c 2015-07-21 18:10:33.000000000 +0100 | |
| +++ linux-4.1.3/drivers/gpu/drm/i915/intel_dp.c 2015-08-02 11:11:37.305576415 +0100 | |
| @@ -102,8 +102,7 @@ | |
| static bool is_edp(struct intel_dp *intel_dp) | |
| { | |
| struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); | |
| - | |
| - return intel_dig_port->base.type == INTEL_OUTPUT_EDP; | |
| + return intel_dig_port->base.type == INTEL_OUTPUT_EDP || strncmp(intel_dp->attached_connector->base.name, "DP-3", 4) == 0; | |
| } | |
| static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp) | |
| @@ -4743,7 +4742,7 @@ | |
| [PORT_D] = PORT_IDPD, | |
| }; | |
| - if (port == PORT_A) | |
| + if (port == PORT_D) | |
| return true; | |
| if (!dev_priv->vbt.child_dev_num) | |
| diff -uNr linux-4.1.3-vanilla/drivers/gpu/drm/i915/intel_lvds.c linux-4.1.3/drivers/gpu/drm/i915/intel_lvds.c | |
| --- linux-4.1.3-vanilla/drivers/gpu/drm/i915/intel_lvds.c 2015-07-21 18:10:33.000000000 +0100 | |
| +++ linux-4.1.3/drivers/gpu/drm/i915/intel_lvds.c 2015-07-31 09:44:22.756192751 +0100 | |
| @@ -552,201 +552,10 @@ | |
| static const struct dmi_system_id intel_no_lvds[] = { | |
| { | |
| .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Apple Mac Mini (Core series)", | |
| + .ident = "modded Thinkpad X230", | |
| .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Apple"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Apple Mac Mini (Core 2 series)", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Apple"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "Macmini2,1"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "MSI IM-945GSE-A", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "MSI"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "A9830IMS"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Dell Studio Hybrid", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "Studio Hybrid 140g"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Dell OptiPlex FX170", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex FX170"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "AOpen Mini PC", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "AOpen"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "i965GMx-IF"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "AOpen Mini PC MP915", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"), | |
| - DMI_MATCH(DMI_BOARD_NAME, "i915GMx-F"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "AOpen i915GMm-HFS", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"), | |
| - DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "AOpen i45GMx-I", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"), | |
| - DMI_MATCH(DMI_BOARD_NAME, "i45GMx-I"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Aopen i945GTt-VFA", | |
| - .matches = { | |
| - DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Clientron U800", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Clientron"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "U800"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Clientron E830", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Clientron"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "E830"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Asus EeeBox PC EB1007", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer INC."), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "EB1007"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Asus AT5NM10T-I", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), | |
| - DMI_MATCH(DMI_BOARD_NAME, "AT5NM10T-I"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Hewlett-Packard HP t5740", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, " t5740"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Hewlett-Packard t5745", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "hp t5745"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Hewlett-Packard st5747", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "hp st5747"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "MSI Wind Box DC500", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), | |
| - DMI_MATCH(DMI_BOARD_NAME, "MS-7469"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Gigabyte GA-D525TUD", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."), | |
| - DMI_MATCH(DMI_BOARD_NAME, "D525TUD"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Supermicro X7SPA-H", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "X7SPA-H"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Fujitsu Esprimo Q900", | |
| - .matches = { | |
| - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), | |
| - DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Q900"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Intel D410PT", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Intel"), | |
| - DMI_MATCH(DMI_BOARD_NAME, "D410PT"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Intel D425KT", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Intel"), | |
| - DMI_EXACT_MATCH(DMI_BOARD_NAME, "D425KT"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Intel D510MO", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Intel"), | |
| - DMI_EXACT_MATCH(DMI_BOARD_NAME, "D510MO"), | |
| - }, | |
| - }, | |
| - { | |
| - .callback = intel_no_lvds_dmi_callback, | |
| - .ident = "Intel D525MW", | |
| - .matches = { | |
| - DMI_MATCH(DMI_BOARD_VENDOR, "Intel"), | |
| - DMI_EXACT_MATCH(DMI_BOARD_NAME, "D525MW"), | |
| + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | |
| + DMI_MATCH(DMI_PRODUCT_NAME, "2324B14"), | |
| }, | |
| }, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment