korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-21 05:14:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Fully separate source vs. sink rates

Browse Source 
Remove the sink vs. source limit mess from intel_dp_max_link_bw() and
just move the source restriction checks to intel_dp_source_rates().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sonika Jindal <sonika.jindal@intel.com>
[danvet: Resolve conflict with WaDisableHBR2:skl patch.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2015-03-12 17:10:32 +02:00 committed by Daniel Vetter
parent d098a50543
commit 1db10e28b2
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/i915/intel_dp.c
View File

@ -126,22 +126,11 @@ int
intel_dp_max_link_bw(struct intel_dp *intel_dp) intel_dp_max_link_bw(struct intel_dp *intel_dp)
{ {
int max_link_bw = intel_dp->dpcd[DP_MAX_LINK_RATE]; int max_link_bw = intel_dp->dpcd[DP_MAX_LINK_RATE];
struct drm_device *dev = intel_dp->attached_connector->base.dev;
switch (max_link_bw) { switch (max_link_bw) {
case DP_LINK_BW_1_62: case DP_LINK_BW_1_62:
case DP_LINK_BW_2_7: case DP_LINK_BW_2_7:
break; case DP_LINK_BW_5_4:
case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */
if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
/* WaDisableHBR2:skl */
max_link_bw = DP_LINK_BW_2_7;
else 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
max_link_bw = DP_LINK_BW_2_7;
break; break;
default: default:
WARN(1, "invalid max DP link bw val %x, using 1.62Gbps\n", WARN(1, "invalid max DP link bw val %x, using 1.62Gbps\n",
@ -1154,10 +1143,8 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates)
} }
static int static int
intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates) intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
{ {
struct drm_device *dev = intel_dp_to_dev(intel_dp);
if (INTEL_INFO(dev)->gen >= 9) { if (INTEL_INFO(dev)->gen >= 9) {
*source_rates = gen9_rates; *source_rates = gen9_rates;
return ARRAY_SIZE(gen9_rates); return ARRAY_SIZE(gen9_rates);
@ -1165,7 +1152,14 @@ intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates)
*source_rates = default_rates; *source_rates = default_rates;
return (intel_dp_max_link_bw(intel_dp) >> 3) + 1; if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
/* WaDisableHBR2:skl */
return (DP_LINK_BW_2_7 >> 3) + 1;
else if (INTEL_INFO(dev)->gen >= 8 ||
(IS_HASWELL(dev) && !IS_HSW_ULX(dev)))
return (DP_LINK_BW_5_4 >> 3) + 1;
else
return (DP_LINK_BW_2_7 >> 3) + 1;
} }
static void static void
@ -1259,7 +1253,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
sink_len = intel_dp_sink_rates(intel_dp, &sink_rates); sink_len = intel_dp_sink_rates(intel_dp, &sink_rates);
source_len = intel_dp_source_rates(intel_dp, &source_rates); source_len = intel_dp_source_rates(dev, &source_rates);
supported_len = intel_supported_rates(source_rates, source_len, supported_len = intel_supported_rates(source_rates, source_len,
sink_rates, sink_len, supported_rates); sink_rates, sink_len, supported_rates);