Regression with i915 and suspend on Thinkpad x220

Sat May 21 21:55:57 PDT 2011

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

Without this change, blits to the front buffer won't invalidate FBC
state, causing us to scan out stale data.  Make sure we update these
bits on every FBC enable, since they may get clobbered if we shut off
the display.

After this changeset, resuming wakes up the backlight, but fails to
restore video and leaves the CPU spinning and the keyboard unresponsive.

Before this changeset, but some distance after 2.6.37, most of the
screen isn't painted, but I can still log on and successfully
suspend/resume.

I've attached my .config and lscpi output.

-- 
Mathematics is the supreme nostalgia of our time.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config
Type: text/x-mpsub
Size: 69000 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20110521/f0405dfa/attachment-0001.bin>
-------------- next part --------------
00:00.0 Host bridge: Intel Corporation 2nd Generation Core Processor Family DRAM Controller (rev 09)
	Subsystem: Lenovo Device 21da
	Flags: bus master, fast devsel, latency 0
	Capabilities: <access denied>
	Kernel driver in use: agpgart-intel

00:02.0 VGA compatible controller: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller (rev 09) (prog-if 00 [VGA controller])
	Subsystem: Lenovo Device 21da
	Flags: bus master, fast devsel, latency 0, IRQ 16
	Memory at d0000000 (64-bit, non-prefetchable) [size=4M]
	Memory at c0000000 (64-bit, prefetchable) [size=256M]
	I/O ports at 5000 [size=64]
	Expansion ROM at <unassigned> [disabled]
	Capabilities: <access denied>
	Kernel driver in use: i915

00:16.0 Communication controller: Intel Corporation 6 Series Chipset Family MEI Controller #1 (rev 04)
	Subsystem: Lenovo Device 21da
	Flags: bus master, fast devsel, latency 0, IRQ 11
	Memory at d2625000 (64-bit, non-prefetchable) [size=16]
	Capabilities: <access denied>

00:16.3 Serial controller: Intel Corporation 6 Series Chipset Family KT Controller (rev 04) (prog-if 02 [16550])
	Subsystem: Lenovo Device 21da
	Flags: bus master, 66MHz, fast devsel, latency 0, IRQ 11
	I/O ports at 50e0 [size=8]
	Memory at d262b000 (32-bit, non-prefetchable) [size=4K]
	Capabilities: <access denied>

00:19.0 Ethernet controller: Intel Corporation 82579LM Gigabit Network Connection (rev 04)
	Subsystem: Lenovo Device 21ce
	Flags: bus master, fast devsel, latency 0, IRQ 10
	Memory at d2600000 (32-bit, non-prefetchable) [size=128K]
	Memory at d262a000 (32-bit, non-prefetchable) [size=4K]
	I/O ports at 5060 [size=32]
	Capabilities: <access denied>

00:1a.0 USB Controller: Intel Corporation 6 Series Chipset Family USB Enhanced Host Controller #2 (rev 04) (prog-if 20 [EHCI])
	Subsystem: Lenovo Device 21da
	Flags: bus master, medium devsel, latency 0, IRQ 16
	Memory at d2629000 (32-bit, non-prefetchable) [size=1K]
	Capabilities: <access denied>
	Kernel driver in use: ehci_hcd

00:1b.0 Audio device: Intel Corporation 6 Series Chipset Family High Definition Audio Controller (rev 04)
	Subsystem: Lenovo Device 21da
	Flags: bus master, fast devsel, latency 0, IRQ 22
	Memory at d2620000 (64-bit, non-prefetchable) [size=16K]
	Capabilities: <access denied>
	Kernel driver in use: HDA Intel

00:1c.0 PCI bridge: Intel Corporation 6 Series Chipset Family PCI Express Root Port 1 (rev b4) (prog-if 00 [Normal decode])
	Flags: bus master, fast devsel, latency 0
	Bus: primary=00, secondary=02, subordinate=02, sec-latency=0
	Capabilities: <access denied>

00:1c.1 PCI bridge: Intel Corporation 6 Series Chipset Family PCI Express Root Port 2 (rev b4) (prog-if 00 [Normal decode])
	Flags: bus master, fast devsel, latency 0
	Bus: primary=00, secondary=03, subordinate=03, sec-latency=0
	Memory behind bridge: d2500000-d25fffff
	Capabilities: <access denied>

00:1c.3 PCI bridge: Intel Corporation 6 Series Chipset Family PCI Express Root Port 4 (rev b4) (prog-if 00 [Normal decode])
	Flags: bus master, fast devsel, latency 0
	Bus: primary=00, secondary=05, subordinate=0c, sec-latency=0
	I/O behind bridge: 00004000-00004fff
	Memory behind bridge: d1d00000-d24fffff
	Prefetchable memory behind bridge: 00000000d0400000-00000000d0bfffff
	Capabilities: <access denied>

00:1c.4 PCI bridge: Intel Corporation 6 Series Chipset Family PCI Express Root Port 5 (rev b4) (prog-if 00 [Normal decode])
	Flags: bus master, fast devsel, latency 0
	Bus: primary=00, secondary=0d, subordinate=0d, sec-latency=0
	I/O behind bridge: 00003000-00003fff
	Memory behind bridge: d1500000-d1cfffff
	Prefetchable memory behind bridge: 00000000d0c00000-00000000d13fffff
	Capabilities: <access denied>

00:1c.6 PCI bridge: Intel Corporation 6 Series Chipset Family PCI Express Root Port 7 (rev b4) (prog-if 00 [Normal decode])
	Flags: bus master, fast devsel, latency 0
	Bus: primary=00, secondary=0e, subordinate=0e, sec-latency=0
	Memory behind bridge: d1400000-d14fffff
	Capabilities: <access denied>

00:1d.0 USB Controller: Intel Corporation 6 Series Chipset Family USB Enhanced Host Controller #1 (rev 04) (prog-if 20 [EHCI])
	Subsystem: Lenovo Device 21da
	Flags: bus master, medium devsel, latency 0, IRQ 23
	Memory at d2628000 (32-bit, non-prefetchable) [size=1K]
	Capabilities: <access denied>
	Kernel driver in use: ehci_hcd

00:1f.0 ISA bridge: Intel Corporation 6 Series Chipset Family LPC Controller (rev 04)
	Subsystem: Lenovo Device 21da
	Flags: bus master, medium devsel, latency 0
	Capabilities: <access denied>

00:1f.2 IDE interface: Intel Corporation 6 Series Chipset Family 4 port SATA IDE Controller (rev 04) (prog-if 8a [Master SecP PriP])
	Subsystem: Lenovo Device 21da
	Flags: bus master, 66MHz, medium devsel, latency 0, IRQ 19
	I/O ports at 01f0 [size=8]
	I/O ports at 03f4 [size=1]
	I/O ports at 0170 [size=8]
	I/O ports at 0374 [size=1]
	I/O ports at 50b0 [size=16]
	I/O ports at 50a0 [size=16]
	Capabilities: <access denied>
	Kernel driver in use: ata_piix

00:1f.3 SMBus: Intel Corporation 6 Series Chipset Family SMBus Controller (rev 04)
	Subsystem: Lenovo Device 21da
	Flags: medium devsel, IRQ 11
	Memory at d2624000 (64-bit, non-prefetchable) [size=256]
	I/O ports at efa0 [size=32]

00:1f.5 IDE interface: Intel Corporation 6 Series Chipset Family 2 port SATA IDE Controller (rev 04) (prog-if 85 [Master SecO PriO])
	Subsystem: Lenovo Device 21da
	Flags: bus master, 66MHz, medium devsel, latency 0, IRQ 19
	I/O ports at 50c8 [size=8]
	I/O ports at 50ec [size=4]
	I/O ports at 50c0 [size=8]
	I/O ports at 50e8 [size=4]
	I/O ports at 5090 [size=16]
	I/O ports at 5080 [size=16]
	Capabilities: <access denied>
	Kernel driver in use: ata_piix

03:00.0 Network controller: Intel Corporation Centrino Advanced-N 6205 (rev 34)
	Subsystem: Intel Corporation Centrino Advanced-N 6205 AGN
	Flags: bus master, fast devsel, latency 0, IRQ 17
	Memory at d2500000 (64-bit, non-prefetchable) [size=8K]
	Capabilities: <access denied>
	Kernel driver in use: iwlagn

0d:00.0 System peripheral: Ricoh Co Ltd Device e823 (rev 04) (prog-if 01)
	Subsystem: Lenovo Device 21da
	Flags: bus master, fast devsel, latency 0, IRQ 16
	Memory at d1500000 (32-bit, non-prefetchable) [size=256]
	Capabilities: <access denied>
	Kernel driver in use: sdhci-pci

0e:00.0 USB Controller: NEC Corporation uPD720200 USB 3.0 Host Controller (rev 04) (prog-if 30 [XHCI])
	Subsystem: Lenovo Device 21da
	Flags: bus master, fast devsel, latency 0, IRQ 11
	Memory at d1400000 (64-bit, non-prefetchable) [size=8K]
	Capabilities: <access denied>