diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-04-29 11:00:22 -0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2014-04-30 09:46:51 +0300 |
| commit | 9bbfd20abe5025adbb0ac75160bd2e41158a9e83 (patch) | |
| tree | 1c91efcd622f4caa9ef9418f877a849e57101b7c /drivers/gpu/drm/i915/intel_dp.c | |
| parent | cfa7c862982b431add7f2b362526bf31372fc7b0 (diff) | |
| download | op-kernel-dev-9bbfd20abe5025adbb0ac75160bd2e41158a9e83.zip op-kernel-dev-9bbfd20abe5025adbb0ac75160bd2e41158a9e83.tar.gz | |
drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX
Because the docs say ULX doesn't support it on HSW.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index dfa8528..5ca68aa9 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -105,7 +105,8 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp) case DP_LINK_BW_2_7: break; case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */ - if ((IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) && + if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || + INTEL_INFO(dev)->gen >= 8) && intel_dp->dpcd[DP_DPCD_REV] >= 0x12) max_link_bw = DP_LINK_BW_5_4; else |
