p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Remove the SPLL==270Mhz assumption from intel_fdi_link_freq() 

Instead of assuming we've correctly set up SPLL to run at 270Mhz for
FDI, let's use the port_clock from pipe_config which should be what
we want. This would catch problems if someone misconfigures SPLL for
whatever reason.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455738073-14502-4-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
This commit is contained in:
Ville Syrjälä 2016-02-17 21:41:10 +02:00
parent e3b247da89
commit 21a727b365
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/i915/intel_display.c
View File

@ -224,12 +224,15 @@ static void intel_update_czclk(struct drm_i915_private *dev_priv)
} }
static inline u32 /* units of 100MHz */ static inline u32 /* units of 100MHz */
intel_fdi_link_freq(struct drm_i915_private *dev_priv) intel_fdi_link_freq(struct drm_i915_private *dev_priv,
const struct intel_crtc_state *pipe_config)
{ {
if (IS_GEN5(dev_priv)) if (HAS_DDI(dev_priv))
return (I915_READ(FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK) + 2; return pipe_config->port_clock; /* SPLL */
else if (IS_GEN5(dev_priv))
return ((I915_READ(FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK) + 2) * 10000;
else else
return 27; return 270000;
} }
static const intel_limit_t intel_limits_i8xx_dac = { static const intel_limit_t intel_limits_i8xx_dac = {
@ -6679,7 +6682,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
* Hence the bw of each lane in terms of the mode signal * Hence the bw of each lane in terms of the mode signal
* is: * is:
*/ */
link_bw = intel_fdi_link_freq(to_i915(dev)) * MHz(100)/KHz(1)/10; link_bw = intel_fdi_link_freq(to_i915(dev), pipe_config);
fdi_dotclock = adjusted_mode->crtc_clock; fdi_dotclock = adjusted_mode->crtc_clock;
@ -10840,7 +10843,7 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc,
* Calculate one based on the FDI configuration. * Calculate one based on the FDI configuration.
*/ */
pipe_config->base.adjusted_mode.crtc_clock = pipe_config->base.adjusted_mode.crtc_clock =
intel_dotclock_calculate(intel_fdi_link_freq(dev_priv) * 10000, intel_dotclock_calculate(intel_fdi_link_freq(dev_priv, pipe_config),
&pipe_config->fdi_m_n); &pipe_config->fdi_m_n);
} }
@ -12873,7 +12876,7 @@ static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,
const struct intel_crtc_state *pipe_config) const struct intel_crtc_state *pipe_config)
{ {
if (pipe_config->has_pch_encoder) { if (pipe_config->has_pch_encoder) {
int fdi_dotclock = intel_dotclock_calculate(intel_fdi_link_freq(dev_priv) * 10000, int fdi_dotclock = intel_dotclock_calculate(intel_fdi_link_freq(dev_priv, pipe_config),
&pipe_config->fdi_m_n); &pipe_config->fdi_m_n);
int dotclock = pipe_config->base.adjusted_mode.crtc_clock; int dotclock = pipe_config->base.adjusted_mode.crtc_clock;