From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Clifton Subject: BISECTED: Suspend regression on drm-intel-next Date: Sat, 18 Dec 2010 20:02:21 +0000 Message-ID: <1292702541.3071.7.camel@pcjc2lap> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from ppsw-51.csi.cam.ac.uk (ppsw-51.csi.cam.ac.uk [131.111.8.151]) by gabe.freedesktop.org (Postfix) with ESMTP id 8106D9E7A8 for ; Sat, 18 Dec 2010 12:02:24 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel List-Id: intel-gfx@lists.freedesktop.org Hi Chris, I bisected the suspend regression I mentioned, and came to this commit: commit 0cdab21f9a1fca50dd27e488839f5a6578e333b2 Author: Chris Wilson Date: Sun Dec 5 17:27:06 2010 +0000 drm/i915: Uncouple render/power ctx before suspending Signed-off-by: Chris Wilson Disabling power context tear down on suspend with this diff: diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index a311809..6e98764 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -820,7 +820,7 @@ int i915_save_state(struct drm_device *dev) if (HAS_PCH_SPLIT(dev)) ironlake_disable_drps(dev); - intel_disable_clock_gating(dev); +// intel_disable_clock_gating(dev); /* Cache mode state */ dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0); NB: I've not tested later than c57802706aad9f179f2219415717896b3c177845, which does not suspend. (I'm actually pretty certain that I tested until around a8e93126a6f10d0a14ba8407ec112b1b3a5e2e97, but it was still bad, and I didn't need to include it in my bisect, I did not make any notes about it. Best regards, -- Peter Clifton Electrical Engineering Division, Engineering Department, University of Cambridge, 9, JJ Thomson Avenue, Cambridge CB3 0FA Tel: +44 (0)7729 980173 - (No signal in the lab!) Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me)