summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiacomo Comes <comes@naic.edu>2014-04-03 14:13:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-13 13:32:55 +0200
commite07b5528f1f4adf101968d8c730201fe38b9b514 (patch)
treef2e43cf84048b81180d0e4124a03bbdf9aee201b
parent93dd8b49c22623eb72a10beb44926dbd948c3618 (diff)
downloadlwn-e07b5528f1f4adf101968d8c730201fe38b9b514.tar.gz
lwn-e07b5528f1f4adf101968d8c730201fe38b9b514.zip
Skip intel_crt_init for Dell XPS 8700
commit 10b6ee4a87811a110cb01eaca01eb04da6801baf upstream. The Dell XPS 8700 has a onboard Display port and HDMI port and no VGA port. The call intel_crt_init freeze the machine, so skip such call. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73559 Signed-off-by: Giacomo Comes <comes at naic.edu> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index e2e39e65f109..a60a755f9977 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -765,6 +765,14 @@ static const struct dmi_system_id intel_no_crt[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
},
},
+ {
+ .callback = intel_no_crt_dmi_callback,
+ .ident = "DELL XPS 8700",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "XPS 8700"),
+ },
+ },
{ }
};