On Tue, Jun 12, 2012 at 02:47:35PM -0700, Jesse Barnes wrote: > Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org> Meh, nicely splitting out pch_crt_dpms and now this. Disappointing ;-) But I guess we've reached the limit of the dpms helpers anyway, and with a few changes in drm_crtc_helper.c to fix up a few past mistakes we can make the dpms handling part fully optional and replace it with something else that fits us better. Sometimes, maybe. -Daniel > --- > drivers/gpu/drm/i915/intel_crt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c > index 1333a65..ac62f24 100644 > --- a/drivers/gpu/drm/i915/intel_crt.c > +++ b/drivers/gpu/drm/i915/intel_crt.c > @@ -88,6 +88,9 @@ static void gmch_crt_dpms(struct drm_encoder *encoder, int mode) > temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE); > temp &= ~ADPA_DAC_ENABLE; > > + if (IS_VALLEYVIEW(dev) && mode != DRM_MODE_DPMS_ON) > + mode = DRM_MODE_DPMS_OFF; > + > switch (mode) { > case DRM_MODE_DPMS_ON: > temp |= ADPA_DAC_ENABLE; > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel at ffwll.ch Mobile: +41 (0)79 365 57 48