diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-13 02:03:39 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-13 02:03:39 -0400 |
| commit | e02aacb6dec0c656379f0c1ff06c5bbb2bcb1e53 (patch) | |
| tree | bfdc641692207eb0dc77df3334e179123ed55111 | |
| parent | 58a6e2e5794d2aeacf6a84afeaed46e3a5e0fbb0 (diff) | |
| parent | c47b9e0944e483309d66c807d650ac8b8ceafb57 (diff) | |
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
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c index bf731e9f643e..7f85c2c1d681 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c | |||
| @@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector | |||
| 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; |
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index afa9db1dc0e3..cead089a9e7d 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
| @@ -326,8 +326,8 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector, | |||
| 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; |