Chris Wilson
c3b2003792
drm/i915: Reset last_retired_head when resetting ring
...
When we reset the ring control registers, including the HEAD and TAIL of
the ring, we also need to reset associated state. In this instance, we
were failing to reset the cached value of ring->last_retired_head and so
upon the first request for more space following a resume would
potentially (depending on a narrow race window) believe that the HEAD had
advanced much further than reality.
This is a regression from:
commit a71d8d9452
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 15 11:25:36 2012 +0000
drm/i915: Record the tail at each request and use it to estimate the head
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org # 3.4
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-29 20:06:58 +02:00
..
accessibility
acpi
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
amba
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00
ata
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
atm
auxdisplay
base
dma-buf updates for 3.5
2012-05-25 09:37:26 -07:00
bcma
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
block
Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1
2012-05-21 20:20:23 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
cdrom
char
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2012-05-24 12:42:54 -07:00
clk
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
clocksource
connector
cpufreq
cpuidle
crypto
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
dca
devfreq
Power management updates for 3.5
2012-05-23 14:07:06 -07:00
dio
dma
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
edac
edac, mips: don't change code that has been removed in edac/mips tree
2012-05-22 11:00:09 +02:00
eisa
extcon
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
firewire
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
firmware
gpio
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
gpu
drm/i915: Reset last_retired_head when resetting ring
2012-05-29 20:06:58 +02:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
hsi
hv
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
hwmon
hwmon updates for 3.5-rc1
2012-05-23 14:15:09 -07:00
hwspinlock
i2c
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-05-26 13:35:03 -07:00
ide
idle
ieee802154
iio
infiniband
InfiniBand/RDMA changes for the 3.5 merge window:
2012-05-21 17:54:55 -07:00
input
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00
iommu
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
leds
lguest
macintosh
md
md updates for 3.5
2012-05-23 17:08:40 -07:00
media
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
memory
memstick
message
mfd
regmap: Fix the dependency on IRQ_DOMAIN for REGMAP_IRQ in the core
2012-05-23 13:11:07 -07:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
mmc
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
mtd
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
net
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
nfc
nubus
of
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-05-26 13:35:03 -07:00
oprofile
parisc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
parport
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
pci
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2012-05-24 12:42:54 -07:00
pcmcia
pinctrl
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
platform
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
pnp
power
pps
ps3
ptp
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
rapidio
regulator
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
remoteproc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
rpmsg
rtc
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
s390
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2012-05-24 16:17:30 -07:00
sbus
scsi
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
sfi
sh
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
sn
spi
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
ssb
staging
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2012-05-24 12:42:54 -07:00
target
Merge branch 'sbp-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-05-23 16:52:27 -07:00
tc
thermal
tty
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
uio
usb
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
uwb
vhost
video
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
virt
virtio
virtio-mmio: Devices parameter parsing
2012-05-22 12:16:15 +09:30
vlynq
vme
w1
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
watchdog
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
xen
Features:
2012-05-24 16:02:08 -07:00
zorro
Kconfig
Staging tree pull request for 3.5-rc1
2012-05-22 16:34:21 -07:00
Makefile
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00