Linus Torvalds
d7b9935a34
i915: Fix i915 suspend delay ...
During system suspend, the "wait for ring buffer to empty" loop would
always time out after three seconds, because the faster cached ring
buffer head read would always return zero. Force the slow-and-careful
PIO read on all but the first iterations of the loop to fix it.
This also removes the unused (and useless) 'actual_head' variable that
tried to approximate doing this, but did it incorrectly.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Dave Airlie <airlied@linux.ie>
Cc: DRI mailing list <dri-devel@lists.freedesktop.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 16:18:25 -08:00
ACPI / Battery: remove battery refresh on resume
2011-01-20 13:14:10 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
thp: transparent hugepage sysfs meminfo
2011-01-13 17:32:46 -08:00
Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:50:24 -08:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
2011-01-14 10:30:09 -08:00
Merge branch 'cpuidle-perf-events' into idle-test
2011-01-12 18:06:19 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
dca: remove unneeded NULL check
2011-01-13 08:03:09 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-01-17 10:54:41 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO
2011-01-13 15:48:29 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2011-01-14 09:08:00 -08:00
i915: Fix i915 suspend delay
2011-01-20 16:18:25 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-13 09:58:38 -08:00
hwmon: (lm93) Add support for LM94
2011-01-18 12:22:54 -08:00
i2c: Encourage move to dev_pm_ops by warning on use of legacy methods
2011-01-14 22:03:50 +01:00
Merge branch 'cpuidle-perf-events' into idle-test
2011-01-12 18:06:19 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-01-17 14:45:48 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
leds: add output inversion option to backlight trigger
2011-01-13 08:03:06 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
block: restore multiple bd_link_disk_holder() support
2011-01-14 18:44:22 +01:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-01-14 09:29:05 -08:00
memstick: factor out transfer initiating functionality in mspro_block.c
2011-01-13 08:03:22 -08:00
mfd: ab8500-core chip version cut 2.0 support
2011-01-14 12:38:18 +01:00
misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage
2011-01-14 12:38:12 +01:00
mmc: sdhci-of: fix build on non-powerpc platforms
2011-01-14 00:22:44 -07:00
Merge git://git.infradead.org/mtd-2.6
2011-01-17 11:15:30 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-01-19 20:25:45 -08:00
drivers/nfc/pn544.c: fix min_t warnings
2011-01-16 17:28:21 -08:00
dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
2011-01-15 22:01:58 -07:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-01-14 09:29:05 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-01-13 20:15:35 -08:00
Merge branch 'pnp' into release
2011-01-12 04:59:44 -05:00
Merge git://git.infradead.org/battery-2.6
2011-01-14 09:25:59 -08:00
pps: add parallel port PPS signal generator
2011-01-13 08:03:21 -08:00
rapidio: add new idt sRIO switches
2011-01-13 08:03:18 -08:00
regulator: Support MAX8998/LP3974 DVS-GPIO
2011-01-14 12:38:16 +01:00
mfd: Support LP3974 RTC
2011-01-14 12:38:16 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-01-19 20:25:45 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
2011-01-14 16:29:49 -08:00
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-01-15 12:33:40 -08:00
SFI: use ioremap_cache() instead of ioremap()
2011-01-11 23:27:25 -05:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
2011-01-18 14:28:48 -08:00
staging: fix build failure in bcm driver
2011-01-17 17:39:39 -08:00
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
Merge branch 'misc' into release
2011-01-12 05:14:15 -05:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-01-15 12:29:50 -08:00
w1: DS2423 counter driver and documentation
2011-01-13 08:03:22 -08:00
watchdog: Add MCF548x watchdog driver.
2011-01-12 13:51:35 +00:00
Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-13 18:46:48 -08:00
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
d7b9935a34