From patchwork Sun May 22 06:23:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 806302 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4M6NpQw021903 for ; Sun, 22 May 2011 06:24:12 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5097A9E7B6 for ; Sat, 21 May 2011 23:23:51 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F0419E733 for ; Sat, 21 May 2011 23:23:42 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id B75417601C2; Sat, 21 May 2011 23:23:41 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Vtc2um0w+-x0; Sat, 21 May 2011 23:23:35 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1033) id 75C007601C4; Sat, 21 May 2011 23:23:35 -0700 (PDT) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 7174F7601C2; Sat, 21 May 2011 23:23:35 -0700 (PDT) Received: by koto.keithp.com (Postfix, from userid 1488) id 06DFF6428B6; Sat, 21 May 2011 23:23:35 -0700 (PDT) From: Keith Packard To: Matt Mackall , Jesse Barnes Subject: Re: Regression with i915 and suspend on Thinkpad x220 In-Reply-To: <1306040157.3322.11.camel@calx> References: <1306040157.3322.11.camel@calx> User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) Date: Sat, 21 May 2011 23:23:34 -0700 Message-ID: MIME-Version: 1.0 Cc: Linux Kernel Mailing List , dri-devel X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 22 May 2011 06:24:12 +0000 (UTC) On Sat, 21 May 2011 23:55:57 -0500, Matt Mackall wrote: > I've got a new Thinkpad x220 which won't wake up from suspend with > 2.6.39, but works fine with 2.6.37. > > I bisected it down to this cset: > > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4efe070896e1f7373c98a13713e659d1f5dee52a > > drm/i915: make the blitter report buffer modifications to the FBC unit For now, you should be able to disable FBC: Let us know if this works. There's a patch heading for 2.6.40 that provides a module parameter to control FBC from the kernel command line. We've got a couple X220s on order and I hope we'll be able to reproduce (and fix) this issue -- FBC saves enough power that we'd like to be able to leave it enabled on hardware that supports it. diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c34a8dd..2a82895 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -183,7 +183,7 @@ static const struct intel_device_info intel_sandybridge_d_info = { static const struct intel_device_info intel_sandybridge_m_info = { .gen = 6, .is_mobile = 1, .need_gfx_hws = 1, .has_hotplug = 1, - .has_fbc = 1, + .has_fbc = 0, .has_bsd_ring = 1, .has_blt_ring = 1, };