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

[Jesse Barnes]

Keith, see below in case you want to update the changelogs.

Jesse

On Wed, 4 Jan 2012 13:36:01 +0000
"Sun, Yi" <yi.sun at intel.com> wrote:

> Now, 3 bugs are fixed by the patches: 
> 
> [patch 1/2] drm/i915: don't disable a PCH DPLL that's	in use 
> and 
> [patch 2/2] drm/i915: only set the intel_crtc DPMS mode to on if the mode set succeeded
> 
> http://lists.freedesktop.org/archives/intel-gfx/2011-November/013424.html 
> http://lists.freedesktop.org/archives/intel-gfx/2011-November/013425.html
> 
> 
> Tested-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 Sun, Yi
> > Sent: Friday, December 16, 2011 2:36 PM
> > To: intel-gfx at lists.freedesktop.org
> > Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: only set the intel_crtc DPMS
> > mode to on if the mode set succeeded
> > 
> > We have tested the patches on Jesse branch ' ivb-3-pipe '. They can fix bug
> > 41917, 41919 and 41976.
> > 
> > Tested-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
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20120104/11156326/attachment.sig>