On Wed, 22 Jun 2011, Keith Packard wrote:
> On Wed, 15 Jun 2011 13:32:56 -0700, Jesse Barnes <jbarnes at
> virtuousgeek.org> wrote:
>
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
> > b/drivers/gpu/drm/i915/i915_drv.c
> > index 0defd42..a1a28fb 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -429,6 +429,9 @@ static int i915_drm_thaw(struct drm_device *dev)
> > /* KMS EnterVT equivalent */
> > if (drm_core_check_feature(dev, DRIVER_MODESET)) {
> > mutex_lock(&dev->struct_mutex);
> > +
> > + intel_init_clock_gating(dev);
> > +
> > dev_priv->mm.suspended = 0;
> >
> > error = i915_gem_init_ringbuffer(dev);
> > diff --git a/drivers/gpu/drm/i915/i915_suspend.c
> > b/drivers/gpu/drm/i915/i915_suspend.c
> > index 60a94d2..b478d16 100644
> > --- a/drivers/gpu/drm/i915/i915_suspend.c
> > +++ b/drivers/gpu/drm/i915/i915_suspend.c
> > @@ -863,8 +863,6 @@ int i915_restore_state(struct drm_device *dev)
> > I915_WRITE(IMR, dev_priv->saveIMR);
> > }
> >
> > - intel_init_clock_gating(dev);
> > -
> > if (IS_IRONLAKE_M(dev)) {
> > ironlake_enable_drps(dev);
> > intel_init_emon(dev);
> >
>
> I haven't seen any comments as to whether this patch needs to be merged
> into the kernel. Has anyone tested this?
I have tested it, and it worked well on my system:
http://marc.info/?l=linux-kernel&m=130817292323254&w=2
Alan Stern
