Re: [PATCH 11/40] drm/i915: Call intel_{dp, hdmi}_prepare for chv

Jesse Barnes
2014-07-29T16:54:21Z

On Sat, 28 Jun 2014 02:04:02 +0300
ville.syrjala@linux.intel.com wrote:

> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> CHV was forgotten the intel_{dp,hdmi}_prepare() were introduced (or the
> chv patches were still in flight?). Call these when enabling the ports.
>
> Things tend to work much better when we actually write something
> to the port registers :)
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 2 ++
> drivers/gpu/drm/i915/intel_hdmi.c | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index b5ec489..e272f92 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2197,6 +2197,8 @@ static void chv_dp_pre_pll_enable(struct intel_encoder *encoder)
> enum pipe pipe = intel_crtc->pipe;
> u32 val;
>
> + intel_dp_prepare(encoder);
> +
> mutex_lock(&dev_priv->dpio_lock);
>
> /* program left/right clock distribution */
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 2422413..c9d77d3 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1240,6 +1240,8 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder)
> enum pipe pipe = intel_crtc->pipe;
> u32 val;
>
> + intel_hdmi_prepare(encoder);
> +
> mutex_lock(&dev_priv->dpio_lock);
>
> /* program left/right clock distribution */

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

--
Jesse Barnes, Intel Open Source Technology Center