From: Damien Lespiau <damien.lespiau@intel.com>
Date: Thu, 7 May 2015 17:38:38 +0000 (+0100)
Subject: drm/i915/skl: Make sure to break when not finding suitable PLL dividers
X-Git-Tag: v4.3-rc1~75^2~36^2~330
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6cf75178deacd87af12a657d914e6bbca806b5ba;p=karo-tx-linux.git

drm/i915/skl: Make sure to break when not finding suitable PLL dividers

Right now, when finishing the cycle with odd dividers without finding a
suitable candidate, we end up in an infinite loop. Make sure to break in
that case.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 54b60a97ef2d..233467f40a4a 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1184,6 +1184,10 @@ found:
 		}
 
 		if (min_dco_index > 2 && dco_count == 2) {
+                        /* oh well, we tried... */
+                        if (retry_with_odd)
+                                break;
+
 			retry_with_odd = true;
 			dco_count = 0;
 		}