diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-04-12 18:16:53 -0300 |
|---|---|---|
| committer | Kamal Mostafa <kamal@canonical.com> | 2013-05-24 10:23:22 -0700 |
| commit | 1c1d6d5d6c89fa54403ee053141795ad71fd7ee0 (patch) | |
| tree | 4e3fa8b0ebd2455237029c1d2612b38ea87c3a41 | |
| parent | d99994528e9946a78a505ca752fa3b73aa8c5a76 (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: Kamal Mostafa <kamal@canonical.com>
| -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 e05d0bae2b18..b17d8a8e4e6f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8452,7 +8452,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)) { |