On Sat, 02 Mar 2013, Jesse Barnes <jbar...@virtuousgeek.org> wrote:
> Fix up a couple of places where we messed with PCH bits on VLV.
I think there's at least a few more spots that need && !IS_VALLEYVIEW():
---
} else if (!HAS_PCH_CPT(dev) || is_cpu_edp(intel_dp)) {
if (!HAS_PCH_SPLIT(dev))
intel_dp->DP |= intel_dp->color_range;
---
if (is_cpu_edp(intel_dp)) {
/* don't miss out required setting for eDP */
if (adjusted_mode->clock < 200000)
intel_dp->DP |= DP_PLL_FREQ_160MHZ;
else
intel_dp->DP |= DP_PLL_FREQ_270MHZ;
}
---
BR,
Jani.
>
> Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 03340fd..05e1000 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -976,7 +976,7 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct
> drm_display_mode *mode,
> intel_dp->DP |= DP_LINK_TRAIN_OFF_CPT;
> }
>
> - if (is_cpu_edp(intel_dp))
> + if (is_cpu_edp(intel_dp) && !IS_VALLEYVIEW(dev))
> ironlake_set_pll_edp(crtc, adjusted_mode->clock);
> }
>
> @@ -1373,7 +1373,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder
> *encoder,
> if (!(tmp & DP_PORT_EN))
> return false;
>
> - if (is_cpu_edp(intel_dp) && IS_GEN7(dev)) {
> + if (is_cpu_edp(intel_dp) && IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) {
> *pipe = PORT_TO_PIPE_CPT(tmp);
> } else if (!HAS_PCH_CPT(dev) || is_cpu_edp(intel_dp)) {
> *pipe = PORT_TO_PIPE(tmp);
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
