Lenovo resume from suspends hangs in i915_gpu_busy or so

Commit Message

Jesse Barnes April 2, 2011, 2:21 a.m. UTC

On Sat, 2 Apr 2011 09:24:10 +0900
Norbert Preining <[e-mail]> wrote:
> > Hm, ok so on resume we're checking GPU busyness, which is normal,
> > but end up hanging on the spinlock?  Do you see what scrolls by
> > above the text you took a picture of (probably a "task hung"
> > message?).
> 
> More than what I can see on the screen shot I cannot grasp.
> 
> > Does this happen reliably?  Does a previous kernel work ok?
> 
> Reliable: yes
> Previous: I don't know, but I can try out some older git release.
>    which one do you suggest?
>   (I got the laptop recently so I don't have a long history with that
> one)

Well I'd start with something like 2.6.37, I think that's the first
release that had IPS.  At least it's good that you can reproduce it
easily...  Can you add something like this to your kernel to see why
the gpu_busy call might be hanging?  I'm guessing we hang trying to
take the spinlock; if so enabling lockdep debugging might tell us who
else took it.

Thanks,
Jesse

Patch

diff --git a/drivers/gpu/drm/i915/i915_dma.c
b/drivers/gpu/drm/i915/i915_dma.c index 8cb7f93..47fb29a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1790,14 +1790,18 @@  bool i915_gpu_busy(void)
        struct drm_i915_private *dev_priv;
        bool ret = false;
 
+       DRM_ERROR("entering busy check, trying to take lock\n");
+       
        spin_lock(&mchdev_lock);
        if (!i915_mch_dev)
                goto out_unlock;
+       DRM_ERROR("got lock, returning current busy status\n");
        dev_priv = i915_mch_dev;
 
        ret = dev_priv->busy;
 
 out_unlock:
+       DRM_ERROR("unlock & return\n");
        spin_unlock(&mchdev_lock);
 
        return ret;