public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 11/13] drm/i915: Fix readout for cnl DPLL kdiv==3
Date: Thu,  7 Feb 2019 19:32:28 +0200	[thread overview]
Message-ID: <20190207173230.22368-11-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20190207173230.22368-1-ville.syrjala@linux.intel.com>

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

The readout code thinks that kdiv of 3 is 4. Fix it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h  | 2 +-
 drivers/gpu/drm/i915/intel_ddi.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 638a586469f9..f8c15148927a 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -9741,7 +9741,7 @@ enum skl_power_gate {
 #define  DPLL_CFGCR1_KDIV(x)		((x) << 6)
 #define  DPLL_CFGCR1_KDIV_1		(1 << 6)
 #define  DPLL_CFGCR1_KDIV_2		(2 << 6)
-#define  DPLL_CFGCR1_KDIV_4		(4 << 6)
+#define  DPLL_CFGCR1_KDIV_3		(4 << 6)
 #define  DPLL_CFGCR1_PDIV_MASK		(0xf << 2)
 #define  DPLL_CFGCR1_PDIV_SHIFT		(2)
 #define  DPLL_CFGCR1_PDIV(x)		((x) << 2)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index ca705546a0ab..fd192baf93b2 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1349,8 +1349,8 @@ int cnl_calc_wrpll_link(struct drm_i915_private *dev_priv,
 	case DPLL_CFGCR1_KDIV_2:
 		p2 = 2;
 		break;
-	case DPLL_CFGCR1_KDIV_4:
-		p2 = 4;
+	case DPLL_CFGCR1_KDIV_3:
+		p2 = 3;
 		break;
 	}
 
-- 
2.19.2

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

  parent reply	other threads:[~2019-02-07 17:33 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-07 17:32 [PATCH 01/13] drm/i915: Don't pass crtc to intel_find_shared_dpll() Ville Syrjala
2019-02-07 17:32 ` [PATCH 02/13] drm/i915: Don't pass crtc to intel_get_shared_dpll() and .get_dpll() Ville Syrjala
2019-02-07 17:32 ` [PATCH 03/13] drm/i915: Pass crtc_state down to skl dpll funcs Ville Syrjala
2019-02-07 17:32 ` [PATCH 04/13] drm/i915: Remove redundant on stack dpll_hw_state from skl_get_dpll() Ville Syrjala
2019-02-07 17:32 ` [PATCH 05/13] drm/i915: Pass crtc_state down to bxt dpll funcs Ville Syrjala
2019-02-07 17:32 ` [PATCH 06/13] drm/i915: Remove redundant on stack dpll_hw_state from bxt_get_dpll() Ville Syrjala
2019-02-07 17:32 ` [PATCH 07/13] drm/i915: Pass crtc_state down to cnl dpll funcs Ville Syrjala
2019-02-07 17:32 ` [PATCH 08/13] drm/i915: Remove redundant on stack dpll_hw_state from cnl_get_dpll() Ville Syrjala
2019-02-07 17:32 ` [PATCH 09/13] drm/i915: Pass crtc_state down to icl dpll funcs Ville Syrjala
2019-02-07 17:32 ` [PATCH 10/13] drm/i915: Remove redundant on stack dpll_hw_state from icl_get_dpll() Ville Syrjala
2019-02-07 17:32 ` Ville Syrjala [this message]
2019-02-07 22:48   ` [PATCH 11/13] drm/i915: Fix readout for cnl DPLL kdiv==3 Lucas De Marchi
2019-02-07 17:32 ` [PATCH 12/13] drm/i915: Nuke icl_calc_dp_combo_pll_link() Ville Syrjala
2019-02-07 17:32 ` [PATCH 13/13] drm/i915: Remove the fragile array index -> link rate mapping Ville Syrjala
2019-02-07 23:11   ` Lucas De Marchi
2019-02-08 12:24     ` Ville Syrjälä
2019-02-07 18:01 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/13] drm/i915: Don't pass crtc to intel_find_shared_dpll() Patchwork
2019-02-07 18:19 ` ✓ Fi.CI.BAT: success " Patchwork
2019-02-07 20:47 ` ✓ Fi.CI.IGT: " Patchwork
2019-03-02  0:28 ` [PATCH 01/13] " Lucas De Marchi

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=20190207173230.22368-11-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox