History

Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

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

Dave Airlie committed 10 years ago

Commit e02aacb2 parents 58a6e2e c47b9e02 files · +4 −4Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/amd/amdgpu/atombios_dp.c +2 −2
  2. drivers/gpu/drm/radeon/atombios_dp.c +2 −2
drivers/gpu/drm/amd/amdgpu/atombios_dp.c+2−2
@@ -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 } else {278 } else {
279 for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {279 for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
280 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 max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;281 max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
282 if (max_pix_clock >= pix_clock) {282 if (max_pix_clock >= pix_clock) {
283 *dp_lanes = lane_num;283 *dp_lanes = lane_num;
drivers/gpu/drm/radeon/atombios_dp.c+2−2
@@ -326,8 +326,8 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector, · 325 unmodified lines
326 }326 }
327 }327 }
328 } else {328 } else {
329 for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {329 for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
330 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 max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;331 max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
332 if (max_pix_clock >= pix_clock) {332 if (max_pix_clock >= pix_clock) {
333 *dp_lanes = lane_num;333 *dp_lanes = lane_num;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t