diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-04-12 18:16:53 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-11 07:18:29 -0700 |
| commit | 3d853eee7ad906d15f54bd0c4547346b7077bc7b (patch) | |
| tree | c136431dea6ce5be840ec0b5e7376bda954d9369 | |
| parent | 396396ac6d52b726665e5cfd8141af1604db2b46 (diff) | |
drm/i915: don't intel_crt_init on any ULT machines
commit c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539 upstream.
We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not
have CRT, so just check for !IS_ULT. This problem happened on a real
machine and resulted in a very ugly dmesg.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
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_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f9ac54a2dc1..c2bb2d9d9b3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8326,7 +8326,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)) { |