Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e02aacb6 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 58a6e2e5 c47b9e09

drivers/gpu/drm/amd/amdgpu/atombios_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector 
			}

		}

	} else {

		for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

		for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {

			for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

				max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;

				if (max_pix_clock >= pix_clock) {

					*dp_lanes = lane_num;

drivers/gpu/drm/radeon/atombios_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector, 
			}

		}

	} else {

		for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

		for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {

			for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

				max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;

				if (max_pix_clock >= pix_clock) {

					*dp_lanes = lane_num;