summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2014-05-03 05:22:38 +0000
committerjsg <jsg@openbsd.org>2014-05-03 05:22:38 +0000
commit32f32b54569def8e5b9a58ff71f040bb720d95ce (patch)
tree2908b8d867a3efdf6673dc94a6823318742bfaa1
parentdrm/i915/tv: fix gen4 composite s-video tv-out (diff)
downloadwireguard-openbsd-32f32b54569def8e5b9a58ff71f040bb720d95ce.tar.xz
wireguard-openbsd-32f32b54569def8e5b9a58ff71f040bb720d95ce.zip
Skip intel_crt_init for Dell XPS 8700
From Giacomo Comes 95849485beb5e665d56269cd05c3c19df399fb20 in ubuntu 3.8 10b6ee4a87811a110cb01eaca01eb04da6801baf in mainline linux
-rw-r--r--sys/dev/pci/drm/i915/intel_crt.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915/intel_crt.c b/sys/dev/pci/drm/i915/intel_crt.c
index d87bb14e14e..adbbadfd4cb 100644
--- a/sys/dev/pci/drm/i915/intel_crt.c
+++ b/sys/dev/pci/drm/i915/intel_crt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intel_crt.c,v 1.8 2014/01/23 10:42:57 jsg Exp $ */
+/* $OpenBSD: intel_crt.c,v 1.9 2014/05/03 05:22:38 jsg Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
*
@@ -729,6 +729,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"),
+ },
+ },
{ }
};