Commit 2ee7fd1e authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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



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

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190207173230.22368-11-ville.syrjala@linux.intel.com


Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent dc41e918

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -9850,7 +9850,7 @@ enum skl_power_gate { 
#define  DPLL_CFGCR1_KDIV(x)		((x) << 6)

#define  DPLL_CFGCR1_KDIV(x)		((x) << 6)

#define  DPLL_CFGCR1_KDIV_1		(1 << 6)

#define  DPLL_CFGCR1_KDIV_1		(1 << 6)

#define  DPLL_CFGCR1_KDIV_2		(2 << 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_MASK		(0xf << 2)

#define  DPLL_CFGCR1_PDIV_SHIFT		(2)

#define  DPLL_CFGCR1_PDIV_SHIFT		(2)

#define  DPLL_CFGCR1_PDIV(x)		((x) << 2)

#define  DPLL_CFGCR1_PDIV(x)		((x) << 2)

drivers/gpu/drm/i915/intel_ddi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1349,8 +1349,8 @@ int cnl_calc_wrpll_link(struct drm_i915_private *dev_priv, 
	case DPLL_CFGCR1_KDIV_2:

	case DPLL_CFGCR1_KDIV_2:

		p2 = 2;

		p2 = 2;

		break;

		break;

	case DPLL_CFGCR1_KDIV_4:

	case DPLL_CFGCR1_KDIV_3:

		p2 = 4;

		p2 = 3;

		break;

		break;

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE