Re: 2.6.35-rc4-git3: Reported regressions from 2.6.34

[Shawn Starr <shawn.starr@rogers.com>]

On Monday, July 19, 2010 08:33:30 pm Shawn Starr wrote:
> On Thursday, July 08, 2010 11:36:25 pm Shawn Starr wrote:
> 
> <snip>
> 
> > > > Bug-Entry       : http://bugzilla.kernel.org/show_bug.cgi?id=16311
> > > > Subject         : [REGRESSION][SUSPEND] 2.6.35-rcX won't suspend
> > > > Lenovo W500 laptop Submitter       : Shawn Starr
> > > > <shawn.starr@rogers.com> Date            : 2010-06-28 0:45 (11 days
> > > > old)
> > > > Message-ID      : <201006272045.17004.shawn.starr@rogers.com>
> > > > References      :
> > > > http://marc.info/?l=linux-kernel&m=127768633705286&w=2
> > > 
> > > I think this might be usefully bisected. Shawn?
> > 
> > I'll have to try bisecting this weekend. It continues in Linux sh0n.net
> > 2.6.35-rc4+ #1 SMP Wed Jul 7 23:58:41 EDT 2010 x86_64 x86_64 x86_64
> > GNU/Linux
> 
> This continues even with no USB devices plugged in. Will try with today's
> snapshot build from Linus's tree. If this still happens, I'll see about
> bisecting.
> 
> Thanks,
> Shawn.

I also am testing this patch I noticed in anholt's tree, this may be GPU 
suspend issue.

diff --git a/drivers/gpu/drm/i915/i915_suspend.c  
b/drivers/gpu/drm/i915/i915_suspend.c
index 60a5800..6e20252 100644 (file)
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -602,7 +602,9 @@ void i915_save_display(struct drm_device *dev)
 
        /* Only save FBC state on the platform that supports FBC */
        if (I915_HAS_FBC(dev)) {
-               if (IS_GM45(dev)) {
+               if (IS_IRONLAKE_M(dev)) {
+                       dev_priv->saveDPFC_CB_BASE = 
I915_READ(ILK_DPFC_CB_BASE);
+               } else if (IS_GM45(dev)) {
                        dev_priv->saveDPFC_CB_BASE = I915_READ(DPFC_CB_BASE);
                } else {
                        dev_priv->saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE);
@@ -706,7 +708,10 @@ void i915_restore_display(struct drm_device *dev)
 
        /* only restore FBC info on the platform that supports FBC*/
        if (I915_HAS_FBC(dev)) {
-               if (IS_GM45(dev)) {
+               if (IS_IRONLAKE_M(dev)) {
+                       ironlake_disable_fbc(dev);
+                       I915_WRITE(ILK_DPFC_CB_BASE, dev_priv-
>saveDPFC_CB_BASE);
+               } else if (IS_GM45(dev)) {
                        g4x_disable_fbc(dev);
                        I915_WRITE(DPFC_CB_BASE, dev_priv->saveDPFC_CB_BASE);
                } else {