sugar/linux
1
0
Fork 0
Code Activity
Files
a21ef715fbb8210c50b1d684145f8acdf2339596
linux/drivers
History
Chris Wilson a21ef715fb drm/i915: Differentiate between sw write location into ring and last hw read 
We need to keep track of the last location we ask the hw to read up to
(RING_TAIL) separately from our last write location into the ring, so
that in the event of a GPU reset we do not tell the HW to proceed into
a partially written request (which can happen if that request is waiting
for an external signal before being executed).

v2: Refactor intel_ring_reset() (Mika)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100144
Testcase: igt/gem_exec_fence/await-hang
Fixes: 821ed7df6e ("drm/i915: Update reset path to fix incomplete requests")
Fixes: d55ac5bf97 ("drm/i915: Defer transfer onto execution timeline to actual hw submission")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170425130049.26147-1-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
(cherry picked from commit e6ba9992de)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170615131129.3061-1-chris@chris-wilson.co.uk
2017-06-19 10:52:34 +03:00
..
accessibility
…
acpi
Merge branches 'acpi-button', 'acpica' and 'acpi-sysfs'
2017-06-03 00:03:29 +02:00
amba
…
android
…
ata
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
atm
…
auxdisplay
…
base
Merge branches 'pm-sleep' and 'powercap'
2017-05-22 20:32:05 +02:00
bcma
…
block
Merge tag 'ceph-for-4.12-rc4' of git://github.com/ceph/ceph-client
2017-06-02 12:03:07 -07:00
bluetooth
Bluetooth: hci_ldisc: Add protocol check to hci_uart_tx_wakeup()
2017-04-30 12:22:14 +02:00
bus
…
cdrom
scsi: introduce a result field in struct scsi_request
2017-04-20 12:16:10 -06:00
char
Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2017-06-02 16:19:47 -07:00
clk
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2017-05-10 13:38:18 -07:00
clocksource
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-12 10:43:25 -07:00
connector
…
cpufreq
Merge branch 'pm-cpufreq'
2017-06-03 00:01:45 +02:00
cpuidle
Merge branches 'pm-domains', 'pm-cpuidle', 'pm-sleep' and 'powercap'
2017-05-09 23:21:46 +02:00
crypto
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
dax
dax: fix false CONFIG_BLOCK dependency
2017-05-13 16:18:21 -07:00
dca
…
devfreq
…
dio
…
dma
dmaengine: pl330: fix warning in pl330_remove
2017-06-02 11:49:44 +05:30
dma-buf
…
edac
EDAC, amd64: Fix reporting of Chip Select sizes on Fam17h
2017-05-03 16:27:36 +02:00
eisa
…
extcon
…
firewire
…
firmware
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-06-02 08:51:53 -07:00
fmc
…
fpga
fpga fr br: update supported version numbers
2017-04-26 11:38:56 +02:00
fsi
…
gpio
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
gpu
drm/i915: Differentiate between sw write location into ring and last hw read
2017-06-19 10:52:34 +03:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2017-06-02 09:23:56 -07:00
hsi
HSI: ssi_protocol: double free in ssip_pn_xmit()
2017-04-21 17:58:45 +02:00
hv
Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2017-05-04 19:15:35 -07:00
hwmon
hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1
2017-06-03 03:55:43 -07:00
hwspinlock
…
hwtracing
drivers/hwtracing/intel_th/msu.c: use set_memory.h header
2017-05-08 17:15:14 -07:00
i2c
i2c: designware: Fix bogus sda_hold_time due to uninitialized vars
2017-05-22 19:22:19 -07:00
ide
ide: don't call memcpy with the same source and destination
2017-05-08 17:36:39 -04:00
idle
x86/intel_idle: add Gemini Lake support
2017-05-01 23:17:37 +02:00
iio
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
infiniband
RDMA/SA: Fix kernel panic in CMA request handler flow
2017-06-01 17:20:14 -04:00
input
Input: axp20x-pek - switch to acpi_dev_present and check for ACPI0011 too
2017-06-02 17:53:20 -07:00
iommu
iommu/mediatek: Include linux/dma-mapping.h
2017-05-17 14:51:54 +02:00
ipack
…
irqchip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-21 11:45:26 -07:00
isdn
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
leds
leds: pca955x: Correct I2C Functionality
2017-05-22 21:12:44 +02:00
lguest
…
lightnvm
lightnvm: fix bad back free on error path
2017-05-04 07:53:04 -06:00
macintosh
Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
2017-05-05 19:33:07 -07:00
mailbox
mailbox: handle empty message in tx_tick
2017-04-27 16:20:04 +05:30
mcb
…
md
Merge tag 'for-4.12/dm-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2017-06-02 11:50:37 -07:00
media
mtk-vcodec: Use designated initializers
2017-05-28 10:23:02 -07:00
memory
memory: omap-gpmc: Fix debug output for access width
2017-05-16 08:12:47 -07:00
memstick
…
message
scsi: mpt: Move scsi_remove_host() out of mptscsih_remove_host()
2017-04-24 18:21:17 -04:00
mfd
mfd: axp20x: Support AXP803 variant
2017-04-27 11:54:49 +01:00
misc
sgi-xp: Use designated initializers
2017-05-28 10:22:42 -07:00
mmc
Merge tag 'mmc-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
2017-05-26 09:05:35 -07:00
mtd
mtd: nand: make nand_ooblayout_lp_hamming_ops static
2017-05-22 09:42:29 +02:00
net
net: ethernet: ax88796: don't call free_irq without request_irq first
2017-05-26 14:55:38 -04:00
nfc
…
ntb
…
nubus
…
nvdimm
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2017-05-12 15:43:10 -07:00
nvme
nvme: Quirk APST on Intel 600P/P3100 devices
2017-05-26 11:53:02 +03:00
nvmem
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
of
Merge tag 'mmc-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
2017-05-24 08:21:56 -07:00
oprofile
…
parisc
…
parport
…
pci
PCI/PM: Add needs_resume flag to avoid suspend complete optimization
2017-05-23 14:18:17 -05:00
pcmcia
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
perf
drivers/perf: arm_pmu_acpi: avoid perf IRQ init when guest PMU is off
2017-05-30 12:40:03 +01:00
phy
…
pinctrl
pinctrl: sunxi: Fix SPDIF function name for A83T
2017-05-23 11:31:27 +02:00
platform
Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2017-05-04 19:15:35 -07:00
pnp
…
power
Merge tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2017-05-12 12:02:21 -07:00
powercap
PowerCap: Fix an error code in powercap_register_zone()
2017-05-14 13:30:05 +02:00
pps
…
ps3
…
ptp
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-01 16:15:18 -07:00
pwm
…
rapidio
Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2017-05-04 19:15:35 -07:00
ras
…
regulator
Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next
2017-04-30 22:17:44 +09:00
remoteproc
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
reset
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
rpmsg
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
rtc
Merge branches 'pm-sleep' and 'powercap'
2017-05-22 20:32:05 +02:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2017-05-16 09:24:44 -07:00
sbus
…
scsi
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2017-06-04 11:15:43 -07:00
sfi
…
sh
…
sn
…
soc
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-19 13:36:56 -07:00
spi
Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next
2017-04-26 15:58:22 +01:00
spmi
…
ssb
…
staging
staging: fsl-dpaa2/eth: add ETHERNET dependency
2017-05-16 14:23:31 +02:00
target
iscsi-target: Always wait for kthread_should_stop() before kthread exit
2017-05-31 15:12:57 -07:00
tc
…
tee
Merge tag 'v4.12-rc1' into fixes
2017-05-18 23:54:47 -07:00
thermal
thermal: broadcom: ns-thermal: default on iProc SoCs
2017-05-23 20:09:34 -07:00
thunderbolt
…
tty
Revert "tty: fix port buffer locking"
2017-06-04 10:23:25 +02:00
uio
uio: fix incorrect memory leak cleanup
2017-05-16 23:06:41 +02:00
usb
Merge tag 'usb-serial-4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
2017-05-19 10:10:07 +02:00
uwb
uwb: fix device quirk on big-endian hosts
2017-05-17 11:27:41 +02:00
vfio
Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2017-05-05 11:36:44 -07:00
vhost
mm: support __GFP_REPEAT in kvmalloc_node for >32kB
2017-05-08 17:15:12 -07:00
video
Merge tag 'fbdev-v4.12' of git://github.com/bzolnier/linux
2017-05-11 11:12:26 -07:00
virt
drivers/virt/fsl_hypervisor.c: use get_user_pages_unlocked()
2017-05-08 17:15:10 -07:00
virtio
virtio: allow extra context per descriptor
2017-05-02 23:41:43 +03:00
vlynq
…
vme
…
w1
…
watchdog
watchdog: bcm281xx: Fix use of uninitialized spinlock.
2017-05-19 10:42:25 +02:00
xen
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-05-09 09:12:53 -07:00
zorro
…
Kconfig
…
Makefile
Merge branch 'tee/initial-merge' into fixes
2017-05-10 21:03:31 +02:00