Dave Airlie
8002db6336
qxl: convert qxl driver to proper use for reservations ...
The recent addition of lockdep support to reservations and their subsequent
use by TTM showed up a number of potential problems with the way qxl was using
TTM objects.
a) it was allocating objects, and reserving them later without validating
underneath the reservation, which meant in extreme conditions the objects could
be evicted before the reservation ever used them.
b) it was reserving objects straight after allocating them, but with no
ability to back off should the reservations fail. It now allocates the necessary
objects then does a complete reservation pass on them to avoid deadlocks.
c) it had two lists per release tracking objects, unnecessary complicating
the reservation process.
This patch removes the dual object tracking, adds reservations ticket support
to the release and fence object handling. It then ports the internal fb
drawing code and the userspace facing ioctl to use the new interfaces properly,
along with cleanup up the error path handling in some codepaths.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-07-24 11:58:10 +10:00
ACPI video support fixes for 3.11
2013-07-21 10:11:04 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Driver core patches for 3.11-rc2
2013-07-18 12:48:40 -07:00
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
2013-07-10 10:16:07 -07:00
ARM SoC device tree changes
2013-07-02 14:23:01 -07:00
drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
2013-07-03 16:07:25 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
clocksource+irqchip: delete __cpuinit usage from all related files
2013-07-14 19:36:57 -04:00
Power management and ACPI fixes for 3.11-rc2
2013-07-19 09:59:06 -07:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
crypto: talitos: use sg_pcopy_to_buffer()
2013-07-09 10:33:30 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
drivers/dma/iop-adma.c: fix new warnings
2013-07-09 10:33:19 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
efivars: check for EFI_RUNTIME_SERVICES
2013-07-11 11:00:31 +01:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
qxl: convert qxl driver to proper use for reservations
2013-07-24 11:58:10 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-07-04 15:35:08 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
Single patch to staticize a local variable
2013-07-18 11:32:36 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
2013-07-10 18:15:41 -07:00
The first round of IIO fixes for the 3.11 cycle.
2013-07-16 22:41:38 -07:00
Main batch of InfiniBand/RDMA changes for 3.11 merge window:
2013-07-13 12:57:21 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-07-13 18:05:13 -07:00
IOMMU Updates for Linux 3.11
2013-07-10 14:46:40 -07:00
clocksource+irqchip: delete __cpuinit usage from all related files
2013-07-14 19:36:57 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
leds: mc13783: Fix "uninitialized variable" warning
2013-07-02 08:44:02 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
md/raid1: fix bio handling problems in process_checks()
2013-07-18 14:18:04 +10:00
[media] saa7134: Fix unlocked snd_pcm_stop() call
2013-07-15 21:25:14 +02:00
drivers/memstick/host/r592.c: convert to module_pci_driver
2013-07-03 16:08:06 -07:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
MMC highlights for 3.11:
2013-07-10 11:16:00 -07:00
A couple of fixes and clean-ups, allow for assigning user-defined
2013-07-05 12:09:48 -07:00
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
2013-07-18 13:04:25 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
drivers: delete __cpuinit usage from all remaining drivers files
2013-07-14 19:36:59 -04:00
parisc: fix LMMIO mismatch between PAT length and MASK register
2013-07-09 22:09:16 +02:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
Driver core patches for 3.11-rc1
2013-07-02 11:44:19 -07:00
Pin control changes for the v3.11 kernel cycle:
2013-07-03 11:48:03 -07:00
x86 platform drivers: fix gpio leak
2013-07-10 15:42:51 -04:00
PNP / ACPI: avoid garbage in resource name
2013-07-18 01:38:59 +02:00
Nothing exciting this time, just assorted fixes and cleanups.
2013-07-10 11:13:00 -07:00
pps-gpio: add device-tree binding and support
2013-07-03 16:08:06 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.
2013-07-11 12:35:09 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
s390/zcrypt: Alias for new zcrypt device driver base module
2013-07-19 08:37:39 +02:00
SCSI for-linus on 20130713
2013-07-13 17:41:21 -07:00
Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
2013-07-15 11:46:16 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Staging tree fixes for 3.11-rc2
2013-07-20 15:42:38 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-07-11 12:57:19 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-07-11 12:26:08 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
2013-07-03 16:07:26 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
vfio Updates for v3.11
2013-07-10 14:50:08 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-07-11 12:57:19 -07:00
uvesafb: Really allow mtrr being 0, as documented and warn()ed
2013-07-16 10:24:28 +10:00
No real surprises.
2013-07-10 14:50:58 -07:00
drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
2013-07-03 16:08:06 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
drivers: delete __cpuinit usage from all remaining drivers files
2013-07-14 19:36:59 -04:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
8002db6336