bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-05 23:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
33d9391d3020e069dca98fa87a604c037beb2b9e
linux/drivers
History
Imre Deak 713a6b6689 drm/i915: Avoid early timeout during AUX transfers 
Since wait_for_atomic doesn't re-check the wait-for condition after
expiry of the timeout it can fail when called from non-atomic context
even if the condition is set correctly before the expiry. Fix this by
using the non-atomic wait_for instead.

Due to the relatively long 10ms timeout, probably this didn't cause any
real problems, but fix it in any case for consistency.

Fixes: 0351b93992 ("drm/i915: Do not lie about atomic timeout granularity")
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
CC: drm-intel-fixes@lists.freedesktop.org
Link: http://patchwork.freedesktop.org/patch/msgid/1467110253-16046-5-git-send-email-imre.deak@intel.com
2016-06-28 22:10:26 +03:00
..
accessibility
…
acpi
Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'
2016-06-03 22:35:05 +02:00
amba
ARM: 8566/1: drivers: amba: properly handle devices with power domains
2016-05-05 19:00:40 +01:00
android
…
ata
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
atm
atm: iphase: off by one in rx_pkt()
2016-05-31 11:52:59 -07:00
auxdisplay
…
base
Merge tag 'pm-4.7-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-05-25 15:29:21 -07:00
bcma
Merge tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd
2016-05-24 11:00:20 -07:00
block
Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2016-05-26 19:34:26 -07:00
bluetooth
Bluetooth: Add USB ID 13D3:3487 to ath3k
2016-05-13 16:54:59 +02:00
bus
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
cdrom
…
char
drm/i915: Add support for mapping an object page by page
2016-06-13 10:03:54 +01:00
clk
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
clocksource
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2016-05-19 11:27:09 -07:00
connector
…
cpufreq
Merge branch 'pm-cpufreq-fixes'
2016-06-03 22:34:18 +02:00
cpuidle
cpuidle: Fix cpuidle_state_is_coupled() argument in cpuidle_enter()
2016-05-18 02:48:37 +02:00
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-05-30 15:20:18 -07:00
dax
/dev/dax, core: file operations and dax-mmap
2016-05-20 22:02:55 -07:00
dca
…
devfreq
PM / devfreq: style/typo fixes
2016-05-03 11:22:10 +09:00
dio
…
dma
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
dma-buf
dma-buf: remove dma_buf_debugfs_create_file()
2016-06-20 22:26:37 +05:30
edac
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2016-05-17 17:05:30 -07:00
eisa
…
extcon
…
firewire
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
firmware
Merge tag 'driver-core-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2016-05-20 21:26:15 -07:00
fmc
…
fpga
…
gpio
gpio: drop lock before reading GPIO direction
2016-05-30 17:11:59 +02:00
gpu
drm/i915: Avoid early timeout during AUX transfers
2016-06-28 22:10:26 +03:00
hid
Merge branch 'for-4.7/wacom' into for-linus
2016-05-17 12:42:27 +02:00
hsi
HSI: omap-ssi: move omap_ssi_port_update_fclk
2016-05-09 22:45:18 +02:00
hv
…
hwmon
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2016-05-26 09:48:23 -07:00
hwspinlock
drivers/hwspinlock: use correct radix tree API
2016-05-20 17:58:30 -07:00
hwtracing
Merge tag 'char-misc-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2016-05-20 21:20:31 -07:00
i2c
i2c: dev: use after free in detach
2016-05-28 17:37:42 +02:00
ide
…
idle
…
iio
Merge tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2016-05-20 22:20:48 -07:00
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-05-28 12:04:17 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-05-27 19:14:35 -07:00
iommu
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
ipack
…
irqchip
irqchip/irq-pic32-evic: Fix bug with external interrupts.
2016-06-02 18:03:50 +01:00
isdn
Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2016-05-20 20:57:27 -07:00
leds
Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2016-05-25 10:40:15 -07:00
lguest
…
lightnvm
lightnvm: reserved space calculation incorrect
2016-05-06 12:51:10 -06:00
macintosh
…
mailbox
mailbox: Fix devm_ioremap_resource error detection code
2016-05-08 22:44:46 +05:30
mcb
mcb: Delete num_cells variable which is not required
2016-05-03 15:52:28 -07:00
md
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2016-05-27 14:28:09 -07:00
media
[media] omap_vout: Switch to use the video/omapfb_dss.h header file
2016-06-03 16:06:39 +03:00
memory
Merge tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd
2016-05-24 11:00:20 -07:00
memstick
drivers/memstick/core/mspro_block: use kmemdup
2016-05-23 17:04:14 -07:00
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2016-05-18 16:38:59 -07:00
mfd
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
misc
Merge tag 'char-misc-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2016-05-20 21:20:31 -07:00
mmc
mmc: sunxi: Re-enable eMMC HS-DDR modes on Allwinner A80
2016-06-02 10:40:20 +02:00
mtd
Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs
2016-05-27 18:49:29 -07:00
net
Backmerge tag 'v4.7-rc2' into drm-next
2016-06-09 11:01:49 +10:00
nfc
NFC: pn533: handle interrupted commands in pn533_recv_frame
2016-05-10 00:01:47 +02:00
ntb
…
nubus
…
nvdimm
Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2016-05-26 19:34:26 -07:00
nvme
nvme/host: Add missing blk_integrity tag_size + flags assignments
2016-05-17 17:14:21 -06:00
nvmem
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
of
Merge tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd
2016-05-24 11:00:20 -07:00
oprofile
…
parisc
…
parport
…
pci
Merge tag 'char-misc-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2016-05-20 21:20:31 -07:00
pcmcia
…
perf
drivers/perf: arm_pmu: Avoid leaking pmu->irq_affinity on error
2016-06-03 10:16:21 +01:00
phy
Merge tag 'usb-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2016-05-20 21:12:25 -07:00
pinctrl
pinctrl: mediatek: fix dual-edge code defect
2016-05-31 10:13:45 +02:00
platform
Merge tag 'chrome-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
2016-05-28 12:32:01 -07:00
pnp
Merge tag 'driver-core-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2016-05-20 21:26:15 -07:00
power
Merge tag 'for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2016-05-20 14:06:21 -07:00
powercap
Merge tag 'pm-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2016-05-16 19:17:22 -07:00
pps
…
ps3
…
ptp
ptp: oops in ptp_ioctl()
2016-05-29 22:32:27 -07:00
pwm
Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2016-05-25 10:40:15 -07:00
rapidio
rapidio/mport_cdev: fix uapi type definitions
2016-05-05 17:38:53 -07:00
ras
…
regulator
regulator: pwm: Use pwm_get_args() where appropriate
2016-05-17 14:45:02 +02:00
remoteproc
remoteproc: Add additional crash reasons
2016-05-12 15:50:19 -07:00
reset
…
rpmsg
rpmsg: add THIS_MODULE to rpmsg_driver in rpmsg core
2016-05-06 11:08:58 -07:00
rtc
rtc: tps6586x: rename so module can be autoloaded
2016-05-21 17:07:17 +02:00
s390
Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2016-05-26 19:34:26 -07:00
sbus
openprom: fix warning
2016-05-20 18:33:37 -07:00
scsi
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2016-05-29 13:28:39 -07:00
sfi
…
sh
…
sn
…
soc
soc: mtk-pmic-wrap: avoid integer overflow warning
2016-05-19 15:20:24 +02:00
spi
Merge tag 'sound-4.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2016-05-28 12:23:12 -07:00
spmi
…
ssb
…
staging
dma-buf/fence: make fence context 64 bit v2
2016-06-02 08:27:41 +02:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-05-28 12:04:17 -07:00
tc
…
thermal
Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'
2016-06-03 22:35:05 +02:00
thunderbolt
thunderbolt: Fix double free of drom buffer
2016-05-02 12:09:22 -05:00
tty
devpts: Make each mount of devpts an independent filesystem.
2016-06-05 10:36:01 -07:00
uio
…
usb
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-05-28 12:04:17 -07:00
uwb
…
vfio
vfio/pci: Allow VPD short read
2016-05-31 21:25:52 -06:00
vhost
target: make close_session optional
2016-05-10 01:19:26 -07:00
video
Merge omapdss header refactoring
2016-06-07 12:42:58 +03:00
virt
…
virtio
virtio_balloon: fix PFN format for virtio-1
2016-05-22 19:44:13 +03:00
vlynq
…
vme
…
w1
…
watchdog
Merge git://www.linux-watchdog.org/linux-watchdog
2016-05-25 10:19:17 -07:00
xen
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-05-28 12:04:17 -07:00
zorro
…
Kconfig
Merge tag 'libnvdimm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2016-05-23 11:18:01 -07:00
Makefile
/dev/dax, pmem: direct access to persistent memory
2016-05-20 22:02:53 -07:00