From: Ville Syrjälä Date: Wed, 30 Jan 2019 18:13:59 +0000 (+0200) Subject: drm/i915: Pick the first unused PLL once again X-Git-Tag: v5.1-rc1~23^2~21^2~9 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8aae2b1cdf4452817943741ed792068b18191465;p=uclinux-h8%2Flinux.git drm/i915: Pick the first unused PLL once again commit 5b0bd14dcc6b ("drm/i915/icl: keep track of unused pll while looping") inadvertently (I presume) changed the code to pick the last unused dpll rather than the first unused one like we did before. While there should most likely be no harm in changing the order let's change back just to avoid a change in the behaviour. At least it might reduce the confusion when staring at logs (took me a while to figure out why DPLL1 being picked over DPLL0 when the latter was most definitely available). Cc: Lucas De Marchi Cc: Paulo Zanoni Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20190130181359.20693-1-ville.syrjala@linux.intel.com Reviewed-by: Paulo Zanoni Acked-by: Lucas De Marchi --- diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c index 8f70838ac7d8..0a42d11c4c33 100644 --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c @@ -258,7 +258,8 @@ intel_find_shared_dpll(struct intel_crtc *crtc, /* Only want to check enabled timings first */ if (shared_dpll[i].crtc_mask == 0) { - unused_pll = pll; + if (!unused_pll) + unused_pll = pll; continue; }