[Intel-gfx] [PATCH 2/2] drm/i915: only set the intel_crtc DPMS mode to on if the mode set succeeded

[Sun, Yi]

We have tested the patches on Jesse branch ' ivb-3-pipe '. They can fix bug 41917, 41919 and 41976.

Test-by Sun Yi <yi.sun at intel.com>

Thanks
   --Yi,Sun


> -----Original Message-----
> From: intel-gfx-bounces+yi.sun=intel.com at lists.freedesktop.org
> [mailto:intel-gfx-bounces+yi.sun=intel.com at lists.freedesktop.org] On Behalf
> Of Jesse Barnes
> Sent: Wednesday, November 16, 2011 2:29 AM
> To: intel-gfx at lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: only set the intel_crtc DPMS mode to
> on if the mode set succeeded
> 
> If it failed, leave it in the "off" state.
> 
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index bb8ed3d..dc3d735 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5813,10 +5813,12 @@ static int intel_crtc_mode_set(struct drm_crtc
> *crtc,
> 
>  	ret = dev_priv->display.crtc_mode_set(crtc, mode, adjusted_mode,
>  					      x, y, old_fb);
> -
>  	drm_vblank_post_modeset(dev, pipe);
> 
> -	intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
> +	if (ret)
> +		intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
> +	else
> +		intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
> 
>  	return ret;
>  }
> --
> 1.7.4.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx