From bb911536f07e5ed9147e3acf55a2cd72dffff70d Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>

Date: Fri, 27 Oct 2017 22:31:26 +0300

Subject: [PATCH] drm/i915: Eliminate pll->state usage from bxt_calc_pll_link()

Mime-version: 1.0

Content-type: text/plain; charset=UTF-8

Content-transfer-encoding: 8bit

Git-commit: bb911536f07e5ed9147e3acf55a2cd72dffff70d

Patch-mainline: v4.16-rc1

References: FATE#322643 bsc#1055900

We should be using the DPLL hw state we got from the current crtc state

to determine the corresponding port clock frequency rather than getting

it via the current state programmed into the DPLL.

V2: Rebase due to intel_dpll_id changes

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20171027193128.14483-5-ville.syrjala@linux.intel.com

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpu/drm/i915/intel_ddi.c |   17 +++++------------

 1 file changed, 5 insertions(+), 12 deletions(-)

--- a/drivers/gpu/drm/i915/intel_ddi.c

+++ b/drivers/gpu/drm/i915/intel_ddi.c

@@ -1423,19 +1423,16 @@ static void hsw_ddi_clock_get(struct int

 	ddi_dotclock_get(pipe_config);

 }

-static int bxt_calc_pll_link(struct drm_i915_private *dev_priv,

-			     enum intel_dpll_id pll_id)

+static int bxt_calc_pll_link(struct intel_crtc_state *crtc_state)

 {

-	struct intel_shared_dpll *pll;

 	struct intel_dpll_hw_state *state;

 	struct dpll clock;

 	/* For DDI ports we always use a shared PLL. */

-	if (WARN_ON(pll_id == DPLL_ID_PRIVATE))

+	if (WARN_ON(!crtc_state->shared_dpll))

 		return 0;

-	pll = &dev_priv->shared_dplls[pll_id];

-	state = &pll->state.hw_state;

+	state = &crtc_state->dpll_hw_state;

 	clock.m1 = 2;

 	clock.m2 = (state->pll0 & PORT_PLL_M2_MASK) << 22;

@@ -1449,13 +1446,9 @@ static int bxt_calc_pll_link(struct drm_

 }

 static void bxt_ddi_clock_get(struct intel_encoder *encoder,

-				struct intel_crtc_state *pipe_config)

+			      struct intel_crtc_state *pipe_config)

 {

-	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

-	enum port port = encoder->port;

-	enum intel_dpll_id pll_id = port;

-

-	pipe_config->port_clock = bxt_calc_pll_link(dev_priv, pll_id);

+	pipe_config->port_clock = bxt_calc_pll_link(pipe_config);

 	ddi_dotclock_get(pipe_config);

 }