Commit b377e0df authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: s/DP_PLL_FREQ_160MHZ/DP_PLL_FREQ_162MHZ/

The DP link frequency is 162MHz, not 160MHz. Rename the ILK eDP PLL
defines to match.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446146763-31821-11-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d6fbdd15
...@@ -4199,7 +4199,7 @@ enum skl_disp_power_wells { ...@@ -4199,7 +4199,7 @@ enum skl_disp_power_wells {
/* eDP */ /* eDP */
#define DP_PLL_FREQ_270MHZ (0 << 16) #define DP_PLL_FREQ_270MHZ (0 << 16)
#define DP_PLL_FREQ_160MHZ (1 << 16) #define DP_PLL_FREQ_162MHZ (1 << 16)
#define DP_PLL_FREQ_MASK (3 << 16) #define DP_PLL_FREQ_MASK (3 << 16)
/* locked once port is enabled */ /* locked once port is enabled */
......
...@@ -1560,11 +1560,11 @@ static void ironlake_set_pll_cpu_edp(struct intel_dp *intel_dp) ...@@ -1560,11 +1560,11 @@ static void ironlake_set_pll_cpu_edp(struct intel_dp *intel_dp)
if (crtc->config->port_clock == 162000) { if (crtc->config->port_clock == 162000) {
/* For a long time we've carried around a ILK-DevA w/a for the /* For a long time we've carried around a ILK-DevA w/a for the
* 160MHz clock. If we're really unlucky, it's still required. * 162MHz clock. If we're really unlucky, it's still required.
*/ */
DRM_DEBUG_KMS("160MHz cpu eDP clock, might need ilk devA w/a\n"); DRM_DEBUG_KMS("162MHz cpu eDP clock, might need ilk devA w/a\n");
dpa_ctl |= DP_PLL_FREQ_160MHZ; dpa_ctl |= DP_PLL_FREQ_162MHZ;
intel_dp->DP |= DP_PLL_FREQ_160MHZ; intel_dp->DP |= DP_PLL_FREQ_162MHZ;
} else { } else {
dpa_ctl |= DP_PLL_FREQ_270MHZ; dpa_ctl |= DP_PLL_FREQ_270MHZ;
intel_dp->DP |= DP_PLL_FREQ_270MHZ; intel_dp->DP |= DP_PLL_FREQ_270MHZ;
...@@ -2327,7 +2327,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, ...@@ -2327,7 +2327,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
intel_dp_get_m_n(crtc, pipe_config); intel_dp_get_m_n(crtc, pipe_config);
if (port == PORT_A) { if (port == PORT_A) {
if ((I915_READ(DP_A) & DP_PLL_FREQ_MASK) == DP_PLL_FREQ_160MHZ) if ((I915_READ(DP_A) & DP_PLL_FREQ_MASK) == DP_PLL_FREQ_162MHZ)
pipe_config->port_clock = 162000; pipe_config->port_clock = 162000;
else else
pipe_config->port_clock = 270000; pipe_config->port_clock = 270000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment