All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] drm/i915: Fix cdclk bypass freq readout for tgl/bxt/glk
@ 2019-09-11 13:31 Ville Syrjala
  2019-09-11 13:31 ` [PATCH 2/4] drm/i915: Fix CD2X pipe select masking during cdclk sanitation Ville Syrjala
                   ` (7 more replies)
  0 siblings, 8 replies; 17+ messages in thread
From: Ville Syrjala @ 2019-09-11 13:31 UTC (permalink / raw)
  To: intel-gfx

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

On tgl/bxt/glk the cdclk bypass frequency depends on the PLL
reference clock. So let's read out the ref clock before we
try to compute the bypass clock.

Cc: Matt Roper <matthew.d.roper@intel.com>
Fixes: 71dc367e2bc3 ("drm/i915: Consolidate bxt/cnl/icl cdclk readout")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 618a93bad0a8..6b75d2a91cd9 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1351,6 +1351,8 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
 	u32 divider;
 	int div;
 
+	bxt_de_pll_readout(dev_priv, cdclk_state);
+
 	if (INTEL_GEN(dev_priv) >= 12)
 		cdclk_state->bypass = cdclk_state->ref / 2;
 	else if (INTEL_GEN(dev_priv) >= 11)
@@ -1358,7 +1360,6 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
 	else
 		cdclk_state->bypass = cdclk_state->ref;
 
-	bxt_de_pll_readout(dev_priv, cdclk_state);
 	if (cdclk_state->vco == 0) {
 		cdclk_state->cdclk = cdclk_state->bypass;
 		goto out;
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2019-09-12 16:02 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-11 13:31 [PATCH 1/4] drm/i915: Fix cdclk bypass freq readout for tgl/bxt/glk Ville Syrjala
2019-09-11 13:31 ` [PATCH 2/4] drm/i915: Fix CD2X pipe select masking during cdclk sanitation Ville Syrjala
2019-09-11 15:00   ` Matt Roper
2019-09-11 15:08     ` Chris Wilson
2019-09-11 19:03       ` Saarinen, Jani
2019-09-11 15:10     ` Jani Nikula
2019-09-11 19:02     ` Saarinen, Jani
2019-09-11 13:31 ` [PATCH 3/4] drm/i915: Reuse cnl_modeset_calc_cdclk() on icl+ Ville Syrjala
2019-09-11 15:03   ` Matt Roper
2019-09-11 13:31 ` [PATCH 4/4] drm/i915: Remove duplicated bxt/cnl/icl .modeset_calc_cdclk() funcs Ville Syrjala
2019-09-11 15:13   ` Matt Roper
2019-09-11 14:47 ` [PATCH 1/4] drm/i915: Fix cdclk bypass freq readout for tgl/bxt/glk Matt Roper
2019-09-11 15:34 ` ✓ Fi.CI.BAT: success for series starting with [1/4] " Patchwork
2019-09-12  2:31 ` ✓ Fi.CI.IGT: " Patchwork
2019-09-12  9:36 ` ✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915: Fix cdclk bypass freq readout for tgl/bxt/glk (rev2) Patchwork
2019-09-12  9:43   ` Chris Wilson
2019-09-12 16:02 ` ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.