diff options
| author | Giacomo Comes <comes@naic.edu> | 2014-04-03 14:13:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-13 13:59:45 +0200 |
| commit | 3c364acd2ce66025c9980cfd2399097376a2bab2 (patch) | |
| tree | 735a846e29f63fa38638020f22a869b4c97e4848 | |
| parent | 67876f85f8cd0282c652a14e227e16121dc54ed8 (diff) | |
| download | linux-3.10-3c364acd2ce66025c9980cfd2399097376a2bab2.tar.gz linux-3.10-3c364acd2ce66025c9980cfd2399097376a2bab2.tar.bz2 linux-3.10-3c364acd2ce66025c9980cfd2399097376a2bab2.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.c | 8 |
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 58b4a53715c..4a809969c5a 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -717,6 +717,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"), + }, + }, { } }; |