diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-01-23 11:18:35 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-01-23 11:18:35 +0000 |
| commit | acaa1723910438a9cc698c818560066360182b63 (patch) | |
| tree | cb4e2435e489c67316fd7fb47fc5196c8da6c081 /sys | |
| parent | 891e7c38ed8fbe2c82f817a1f0e2f1efa153a04a (diff) | |
drm/i915: don't intel_crt_init on any ULT machines
From Paulo Zanoni
1c1d6d5d6c89fa54403ee053141795ad71fd7ee0 in ubuntu 3.8
c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539 in mainline linux
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c index dfcef5fa018..ac959654bad 100644 --- a/sys/dev/pci/drm/i915/intel_display.c +++ b/sys/dev/pci/drm/i915/intel_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_display.c,v 1.21 2014/01/23 10:42:57 jsg Exp $ */ +/* $OpenBSD: intel_display.c,v 1.22 2014/01/23 11:18:34 jsg Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -8564,7 +8564,7 @@ static void intel_setup_outputs(struct drm_device *dev) I915_WRITE(PFIT_CONTROL, 0); } - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) + if (!IS_ULT(dev)) intel_crt_init(dev); if (HAS_DDI(dev)) { |