From: Ander Conselvan de Oliveira Date: Mon, 21 Mar 2016 16:00:05 +0000 (+0200) Subject: drm/i915: Call g4x_find_best_dpll() directly from ILK+ code X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2d7feacc817e8882ab87f29e468918f6dbabf611;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Call g4x_find_best_dpll() directly from ILK+ code The call to dev_priv->display.find_dpll() is already in platform specific code, so avoid the extra detour. Signed-off-by: Ander Conselvan de Oliveira Reviewed-by: Ville Syrjälä Reviewed-by: Maarten Lankhorst Link: http://patchwork.freedesktop.org/patch/msgid/1458576016-30348-5-git-send-email-ander.conselvan.de.oliveira@intel.com --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8c90426f001e..14f6e3055b44 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8676,9 +8676,8 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc, * refclk, or FALSE. The returned values represent the clock equation: * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. */ - ret = dev_priv->display.find_dpll(limit, crtc_state, - crtc_state->port_clock, - refclk, NULL, clock); + ret = g4x_find_best_dpll(limit, crtc_state, crtc_state->port_clock, + refclk, NULL, clock); if (!ret) return false;