1 files changed, 24 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 6c6846cdaa30..9151ded9c1cd 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -611,8 +611,7 @@ void radeon_compute_pll(struct radeon_pll *pll,
                                         if ((best_vco == 0 && error < best_error) ||
                                             (best_vco != 0 &&
                                              ((best_error > 100 && error < best_error - 100) ||
-                                              (abs(error - best_error) < 100 &&
-                                               vco_diff < best_vco_diff)))) {
+                                              (abs(error - best_error) < 100 && vco_diff < best_vco_diff)))) {
                                                 best_post_div = post_div;
                                                 best_ref_div = ref_div;
                                                 best_feedback_div = feedback_div;
@@ -620,6 +619,29 @@ void radeon_compute_pll(struct radeon_pll *pll,
                                                 best_freq = current_freq;
                                                 best_error = error;
                                                 best_vco_diff = vco_diff;
+                                        } else if (current_freq == freq) {
+                                                if (best_freq == -1) {
+                                                        best_post_div = post_div;
+                                                        best_ref_div = ref_div;
+                                                        best_feedback_div = feedback_div;
+                                                        best_frac_feedback_div = frac_feedback_div;
+                                                        best_freq = current_freq;
+                                                        best_error = error;
+                                                        best_vco_diff = vco_diff;
+                                                } else if (((pll->flags & RADEON_PLL_PREFER_LOW_REF_DIV) && (ref_div < best_ref_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_HIGH_REF_DIV) && (ref_div > best_ref_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_LOW_FB_DIV) && (feedback_div < best_feedback_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_HIGH_FB_DIV) && (feedback_div > best_feedback_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_LOW_POST_DIV) && (post_div < best_post_div)) ||
+                                                           ((pll->flags & RADEON_PLL_PREFER_HIGH_POST_DIV) && (post_div > best_post_div))) {
+                                                        best_post_div = post_div;
+                                                        best_ref_div = ref_div;
+                                                        best_feedback_div = feedback_div;
+                                                        best_frac_feedback_div = frac_feedback_div;
+                                                        best_freq = current_freq;
+                                                        best_error = error;
+                                                        best_vco_diff = vco_diff;
+                                                }
                                         }
                                         if (current_freq < freq)
                                                 min_frac_feed_div = frac_feedback_div + 1;