DP mode validation regression fix. * 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux: drm/amdgpu: fix DP mode validation drm/radeon: fix DP mode validation
Unified · Split
| @@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector · 275 unmodified lines | ||
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | } else { |
| 279 | − for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) { | |
| 280 | − for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) { | |
| 279 | + for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) { | |
| 280 | + for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) { | |
| 281 | 281 | max_pix_clock = (lane_num * link_rates[i] * 8) / bpp; |
| 282 | 282 | if (max_pix_clock >= pix_clock) { |
| 283 | 283 | *dp_lanes = lane_num; |
| @@ -326,8 +326,8 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector, · 325 unmodified lines | ||
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | } else { |
| 329 | − for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) { | |
| 330 | − for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) { | |
| 329 | + for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) { | |
| 330 | + for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) { | |
| 331 | 331 | max_pix_clock = (lane_num * link_rates[i] * 8) / bpp; |
| 332 | 332 | if (max_pix_clock >= pix_clock) { |
| 333 | 333 | *dp_lanes = lane_num; |