diff options
-rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 7ea373ffe7a1..8d49a964cb2c 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c | |||
@@ -1239,7 +1239,7 @@ void intel_disable_ddi(struct intel_encoder *encoder) | |||
1239 | /* This will be needed in the future, so leave it here for now */ | 1239 | /* This will be needed in the future, so leave it here for now */ |
1240 | } | 1240 | } |
1241 | 1241 | ||
1242 | static int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv) | 1242 | int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv) |
1243 | { | 1243 | { |
1244 | if (I915_READ(HSW_FUSE_STRAP) & HSW_CDCLK_LIMIT) | 1244 | if (I915_READ(HSW_FUSE_STRAP) & HSW_CDCLK_LIMIT) |
1245 | return 450; | 1245 | return 450; |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7e3c1deb80b1..8c9bbc2f456b 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -370,7 +370,9 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, | |||
370 | * clock divider. | 370 | * clock divider. |
371 | */ | 371 | */ |
372 | if (is_cpu_edp(intel_dp)) { | 372 | if (is_cpu_edp(intel_dp)) { |
373 | if (IS_VALLEYVIEW(dev)) | 373 | if (IS_HASWELL(dev)) |
374 | aux_clock_divider = intel_ddi_get_cdclk_freq(dev_priv) >> 1; | ||
375 | else if (IS_VALLEYVIEW(dev)) | ||
374 | aux_clock_divider = 100; | 376 | aux_clock_divider = 100; |
375 | else if (IS_GEN6(dev) || IS_GEN7(dev)) | 377 | else if (IS_GEN6(dev) || IS_GEN7(dev)) |
376 | aux_clock_divider = 200; /* SNB & IVB eDP input clock at 400Mhz */ | 378 | aux_clock_divider = 200; /* SNB & IVB eDP input clock at 400Mhz */ |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 2ad70d744232..ff2000a16236 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -608,6 +608,7 @@ extern bool intel_ddi_get_hw_state(struct intel_encoder *encoder, | |||
608 | extern void intel_ddi_mode_set(struct drm_encoder *encoder, | 608 | extern void intel_ddi_mode_set(struct drm_encoder *encoder, |
609 | struct drm_display_mode *mode, | 609 | struct drm_display_mode *mode, |
610 | struct drm_display_mode *adjusted_mode); | 610 | struct drm_display_mode *adjusted_mode); |
611 | extern int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); | ||
611 | extern void intel_ddi_pll_init(struct drm_device *dev); | 612 | extern void intel_ddi_pll_init(struct drm_device *dev); |
612 | extern void intel_ddi_enable_pipe_func(struct drm_crtc *crtc); | 613 | extern void intel_ddi_enable_pipe_func(struct drm_crtc *crtc); |
613 | extern void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, | 614 | extern void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, |