[Intel-gfx] [PATCH 07/16] drm/i915: Enable DVO between mode_set and dpms hooks

[Thomas Richter]

On 15.08.2014 00:21, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> To more closely match the IEGD ns2501 driver behaviour, call the
> mode_set hook while the DVO port is still disabled, then enable the DVO
> port, and finally call the dpms hook.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Tested-by: Thomas Richter <richter at rus.uni-stuttgart.de>

> ---
>   drivers/gpu/drm/i915/intel_dvo.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index d5ea393..4f115c1 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -185,12 +185,13 @@ static void intel_enable_dvo(struct intel_encoder *encoder)
>   	u32 dvo_reg = intel_dvo->dev.dvo_reg;
>   	u32 temp = I915_READ(dvo_reg);
>
> -	I915_WRITE(dvo_reg, temp | DVO_ENABLE);
> -	I915_READ(dvo_reg);
>   	intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev,
>   					 &crtc->config.requested_mode,
>   					 &crtc->config.adjusted_mode);
>
> +	I915_WRITE(dvo_reg, temp | DVO_ENABLE);
> +	I915_READ(dvo_reg);
> +
>   	intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true);
>   }
>
>