5 files changed, 38 insertions, 15 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 8297bc319369..1846d65b7285 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -96,7 +96,7 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
          * In practice this won't execute very often unless on very fast
          * machines because the time window for this to happen is very small.
          */
-        while (amdgpuCrtc->enabled && repcnt--) {
+        while (amdgpuCrtc->enabled && --repcnt) {
                 /* GET_DISTANCE_TO_VBLANKSTART returns distance to real vblank
                  * start in hpos, and to the "fudged earlier" vblank start in
                  * vpos.
@@ -112,13 +112,13 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
                         break;
 
                 /* Sleep at least until estimated real start of hw vblank */
-                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
                 min_udelay = (-hpos + 1) * max(vblank->linedur_ns / 1000, 5);
                 if (min_udelay > vblank->framedur_ns / 2000) {
                         /* Don't wait ridiculously long - something is wrong */
                         repcnt = 0;
                         break;
                 }
+                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
                 usleep_range(min_udelay, 2 * min_udelay);
                 spin_lock_irqsave(&crtc->dev->event_lock, flags);
         };
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
index 21aacc1f45c1..bf731e9f643e 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
@@ -265,15 +265,27 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector
         unsigned max_lane_num = drm_dp_max_lane_count(dpcd);
         unsigned lane_num, i, max_pix_clock;
 
-        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++) {
-                        max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
+        if (amdgpu_connector_encoder_get_dp_bridge_encoder_id(connector) ==
+            ENCODER_OBJECT_ID_NUTMEG) {
+                for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
+                        max_pix_clock = (lane_num * 270000 * 8) / bpp;
                         if (max_pix_clock >= pix_clock) {
                                 *dp_lanes = lane_num;
-                                *dp_rate = link_rates[i];
+                                *dp_rate = 270000;
                                 return 0;
                         }
                 }
+        } 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++) {
+                                max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
+                                if (max_pix_clock >= pix_clock) {
+                                        *dp_lanes = lane_num;
+                                        *dp_rate = link_rates[i];
+                                        return 0;
+                                }
+                        }
+                }
         }
 
         return -EINVAL;
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 44ee72e04df9..6af832545bc5 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -315,15 +315,27 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector,
         unsigned max_lane_num = drm_dp_max_lane_count(dpcd);
         unsigned lane_num, i, max_pix_clock;
 
-        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++) {
-                        max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
+        if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
+            ENCODER_OBJECT_ID_NUTMEG) {
+                for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
+                        max_pix_clock = (lane_num * 270000 * 8) / bpp;
                         if (max_pix_clock >= pix_clock) {
                                 *dp_lanes = lane_num;
-                                *dp_rate = link_rates[i];
+                                *dp_rate = 270000;
                                 return 0;
                         }
                 }
+        } 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++) {
+                                max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
+                                if (max_pix_clock >= pix_clock) {
+                                        *dp_lanes = lane_num;
+                                        *dp_rate = link_rates[i];
+                                        return 0;
+                                }
+                        }
+                }
         }
 
         return -EINVAL;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 2b9ba03a7c1a..2d9196a447fd 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -455,7 +455,7 @@ static void radeon_flip_work_func(struct work_struct *__work)
          * In practice this won't execute very often unless on very fast
          * machines because the time window for this to happen is very small.
          */
-        while (radeon_crtc->enabled && repcnt--) {
+        while (radeon_crtc->enabled && --repcnt) {
                 /* GET_DISTANCE_TO_VBLANKSTART returns distance to real vblank
                  * start in hpos, and to the "fudged earlier" vblank start in
                  * vpos.
@@ -471,13 +471,13 @@ static void radeon_flip_work_func(struct work_struct *__work)
                         break;
 
                 /* Sleep at least until estimated real start of hw vblank */
-                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
                 min_udelay = (-hpos + 1) * max(vblank->linedur_ns / 1000, 5);
                 if (min_udelay > vblank->framedur_ns / 2000) {
                         /* Don't wait ridiculously long - something is wrong */
                         repcnt = 0;
                         break;
                 }
+                spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
                 usleep_range(min_udelay, 2 * min_udelay);
                 spin_lock_irqsave(&crtc->dev->event_lock, flags);
         };
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 0f14d897baf9..7a98823bacd1 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1079,6 +1079,8 @@ force:
 
         /* update display watermarks based on new power state */
         radeon_bandwidth_update(rdev);
+        /* update displays */
+        radeon_dpm_display_configuration_changed(rdev);
 
         /* wait for the rings to drain */
         for (i = 0; i < RADEON_NUM_RINGS; i++) {
@@ -1095,9 +1097,6 @@ force:
 
         radeon_dpm_post_set_power_state(rdev);
 
-        /* update displays */
-        radeon_dpm_display_configuration_changed(rdev);
-
         rdev->pm.dpm.current_active_crtcs = rdev->pm.dpm.new_active_crtcs;
         rdev->pm.dpm.current_active_crtc_count = rdev->pm.dpm.new_active_crtc_count;
         rdev->pm.dpm.single_display = single_display;