drm/i915: Fix readout for cnl DPLL kdiv==3

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

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190207173230.22368-11-ville.syrjala@linux.intel.com
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 477dfda38fc79644e1756c7ee1e51e3827490a1e..85e8d1a1f70b26fe8b4a636cc1f8e8e96115f261 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -9850,7 +9850,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 69aa0d1487959e3c04137a932f119066b421a79f..16f28e78afcd8f6a191b48d335abb0d3a26cef1f 100644 (file)
--- 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;
        }