From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/4] drm/i915: Fix cdclk bypass freq readout for tgl/bxt/glk
Date: Wed, 11 Sep 2019 16:31:26 +0300 [thread overview]
Message-ID: <20190911133129.27466-1-ville.syrjala@linux.intel.com> (raw)
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
next reply other threads:[~2019-09-11 13:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 13:31 Ville Syrjala [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190911133129.27466-1-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.