aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiacomo Comes <comes@naic.edu>2014-04-03 14:13:55 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-04 03:30:53 -0400
commit10b6ee4a87811a110cb01eaca01eb04da6801baf (patch)
tree2915dfa43d5378272ca48e5df4df793a1420c146
parent09c87db8b499da5fc5e474a665559a26aecd7c7f (diff)
Skip intel_crt_init for Dell XPS 8700
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> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-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 4b4e8f0f9621..aa5a3dc43342 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -804,6 +804,14 @@ static const struct dmi_system_id intel_no_crt[] = {
804 DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"), 804 DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
805 }, 805 },
806 }, 806 },
807 {
808 .callback = intel_no_crt_dmi_callback,
809 .ident = "DELL XPS 8700",
810 .matches = {
811 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
812 DMI_MATCH(DMI_PRODUCT_NAME, "XPS 8700"),
813 },
814 },
807 { } 815 { }
808}; 816};
809 817