Revision 280d479b310298dfeb1d6f9a1617eca37beb6ce4 authored by Chris Wilson on 22 December 2018, 03:06:23 UTC, committed by Jani Nikula on 10 January 2019, 13:09:51 UTC
If we fail to pin the ggtt vma slot for the ppgtt page tables, we need
to unwind the locals before reporting the error. Or else on subsequent
attempts to bind the page tables into the ggtt, we will already believe
that the vma has been pinned and continue on blithely. If something else
should happen to be at that location, choas ensues.
Fixes: a2bbf7148342 ("drm/i915/gtt: Only keep gen6 page directories pinned while active")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Cc: <stable@vger.kernel.org> # v4.19+
Reviewed-by: Matthew Auld <matthew.william.auld@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181222030623.21710-1-chris@chris-wilson.co.uk
(cherry picked from commit d4de753526f4d99f541f1b6ed1d963005c09700c)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 107c595
| File | Mode | Size |
|---|---|---|
| ABI | ||
| EDID | ||
| PCI | ||
| RCU | ||
| accelerators | ||
| accounting | ||
| acpi | ||
| admin-guide | ||
| aoe | ||
| arm | ||
| arm64 | ||
| auxdisplay | ||
| backlight | ||
| block | ||
| blockdev | ||
| bpf | ||
| bus-devices | ||
| cdrom | ||
| cgroup-v1 | ||
| cma | ||
| connector | ||
| console | ||
| core-api | ||
| cpu-freq | ||
| cpuidle | ||
| crypto | ||
| dev-tools | ||
| device-mapper | ||
| devicetree | ||
| doc-guide | ||
| driver-api | ||
| driver-model | ||
| early-userspace | ||
| extcon | ||
| fault-injection | ||
| fb | ||
| features | ||
| filesystems | ||
| firmware_class | ||
| fmc | ||
| fpga | ||
| gpio | ||
| gpu | ||
| hid | ||
| hwmon | ||
| i2c | ||
| ia64 | ||
| ide | ||
| iio | ||
| infiniband | ||
| input | ||
| ioctl | ||
| isdn | ||
| kbuild | ||
| kdump | ||
| kernel-hacking | ||
| laptops | ||
| leds | ||
| lightnvm | ||
| livepatch | ||
| locking | ||
| m68k | ||
| maintainer | ||
| md | ||
| media | ||
| memory-devices | ||
| mic | ||
| mips | ||
| misc-devices | ||
| mmc | ||
| mtd | ||
| namespaces | ||
| netlabel | ||
| networking | ||
| nfc | ||
| nios2 | ||
| nvdimm | ||
| nvmem | ||
| openrisc | ||
| parisc | ||
| pcmcia | ||
| perf | ||
| phy | ||
| platform | ||
| power | ||
| powerpc | ||
| pps | ||
| process | ||
| pti | ||
| ptp | ||
| rapidio | ||
| riscv | ||
| s390 | ||
| scheduler | ||
| scsi | ||
| security | ||
| serial | ||
| sh | ||
| sound | ||
| sparc | ||
| sphinx | ||
| sphinx-static | ||
| spi | ||
| sysctl | ||
| target | ||
| thermal | ||
| timers | ||
| trace | ||
| translations | ||
| usb | ||
| userspace-api | ||
| virtual | ||
| vm | ||
| w1 | ||
| watchdog | ||
| wimax | ||
| x86 | ||
| xilinx | ||
| xtensa | ||
| .gitignore | -rw-r--r-- | 13 bytes |
| Changes | l--------- | 19 bytes |
| CodingStyle | -rw-r--r-- | 48 bytes |
| DMA-API-HOWTO.txt | -rw-r--r-- | 34.1 KB |
| DMA-API.txt | -rw-r--r-- | 27.9 KB |
| DMA-ISA-LPC.txt | -rw-r--r-- | 5.1 KB |
| DMA-attributes.txt | -rw-r--r-- | 6.9 KB |
| IPMI.txt | -rw-r--r-- | 29.7 KB |
| IRQ-affinity.txt | -rw-r--r-- | 2.5 KB |
| IRQ-domain.txt | -rw-r--r-- | 10.9 KB |
| IRQ.txt | -rw-r--r-- | 994 bytes |
| Intel-IOMMU.txt | -rw-r--r-- | 3.9 KB |
| Makefile | -rw-r--r-- | 4.5 KB |
| SAK.txt | -rw-r--r-- | 3.0 KB |
| SM501.txt | -rw-r--r-- | 2.8 KB |
| SubmittingPatches | -rw-r--r-- | 54 bytes |
| atomic_bitops.txt | -rw-r--r-- | 1.5 KB |
| atomic_t.txt | -rw-r--r-- | 5.5 KB |
| bt8xxgpio.txt | -rw-r--r-- | 4.0 KB |
| btmrvl.txt | -rw-r--r-- | 2.7 KB |
| bus-virt-phys-mapping.txt | -rw-r--r-- | 8.0 KB |
| clearing-warn-once.txt | -rw-r--r-- | 224 bytes |
| conf.py | -rw-r--r-- | 19.3 KB |
| cpu-load.txt | -rw-r--r-- | 3.0 KB |
| cputopology.txt | -rw-r--r-- | 5.6 KB |
| crc32.txt | -rw-r--r-- | 8.6 KB |
| dcdbas.txt | -rw-r--r-- | 3.9 KB |
| debugging-modules.txt | -rw-r--r-- | 954 bytes |
| debugging-via-ohci1394.txt | -rw-r--r-- | 7.5 KB |
| dell_rbu.txt | -rw-r--r-- | 5.0 KB |
| digsig.txt | -rw-r--r-- | 3.0 KB |
| docutils.conf | -rw-r--r-- | 158 bytes |
| dontdiff | -rw-r--r-- | 2.5 KB |
| efi-stub.txt | -rw-r--r-- | 3.8 KB |
| eisa.txt | -rw-r--r-- | 7.6 KB |
| flexible-arrays.txt | -rw-r--r-- | 5.6 KB |
| futex-requeue-pi.txt | -rw-r--r-- | 5.1 KB |
| gcc-plugins.txt | -rw-r--r-- | 2.9 KB |
| highuid.txt | -rw-r--r-- | 2.6 KB |
| hw_random.txt | -rw-r--r-- | 3.8 KB |
| hwspinlock.txt | -rw-r--r-- | 12.5 KB |
| index.rst | -rw-r--r-- | 3.0 KB |
| intel_txt.txt | -rw-r--r-- | 10.3 KB |
| io-mapping.txt | -rw-r--r-- | 3.3 KB |
| io_ordering.txt | -rw-r--r-- | 2.0 KB |
| iostats.txt | -rw-r--r-- | 8.7 KB |
| irqflags-tracing.txt | -rw-r--r-- | 2.3 KB |
| isa.txt | -rw-r--r-- | 5.1 KB |
| isapnp.txt | -rw-r--r-- | 492 bytes |
| kernel-per-CPU-kthreads.txt | -rw-r--r-- | 13.3 KB |
| kobject.txt | -rw-r--r-- | 18.5 KB |
| kprobes.txt | -rw-r--r-- | 30.3 KB |
| kref.txt | -rw-r--r-- | 8.9 KB |
| ldm.txt | -rw-r--r-- | 4.6 KB |
| lockup-watchdogs.txt | -rw-r--r-- | 4.1 KB |
| logo.gif | -rw-r--r-- | 16.0 KB |
| logo.txt | -rw-r--r-- | 563 bytes |
| lsm.txt | -rw-r--r-- | 10.5 KB |
| lzo.txt | -rw-r--r-- | 7.9 KB |
| mailbox.txt | -rw-r--r-- | 4.4 KB |
| memory-barriers.txt | -rw-r--r-- | 114.6 KB |
| men-chameleon-bus.txt | -rw-r--r-- | 5.7 KB |
| nommu-mmap.txt | -rw-r--r-- | 12.4 KB |
| ntb.txt | -rw-r--r-- | 10.8 KB |
| numastat.txt | -rw-r--r-- | 1.0 KB |
| padata.txt | -rw-r--r-- | 7.4 KB |
| parport-lowlevel.txt | -rw-r--r-- | 37.1 KB |
| percpu-rw-semaphore.txt | -rw-r--r-- | 1.1 KB |
| phy.txt | -rw-r--r-- | 7.8 KB |
| pi-futex.txt | -rw-r--r-- | 5.7 KB |
| pnp.txt | -rw-r--r-- | 7.0 KB |
| preempt-locking.txt | -rw-r--r-- | 5.6 KB |
| pwm.txt | -rw-r--r-- | 6.2 KB |
| rbtree.txt | -rw-r--r-- | 14.8 KB |
| remoteproc.txt | -rw-r--r-- | 12.6 KB |
| rfkill.txt | -rw-r--r-- | 5.0 KB |
| robust-futex-ABI.txt | -rw-r--r-- | 8.7 KB |
| robust-futexes.txt | -rw-r--r-- | 9.5 KB |
| rpmsg.txt | -rw-r--r-- | 13.1 KB |
| rtc.txt | -rw-r--r-- | 7.0 KB |
| sgi-ioc4.txt | -rw-r--r-- | 2.1 KB |
| siphash.txt | -rw-r--r-- | 6.3 KB |
| smsc_ece1099.txt | -rw-r--r-- | 2.5 KB |
| speculation.txt | -rw-r--r-- | 2.8 KB |
| static-keys.txt | -rw-r--r-- | 13.0 KB |
| svga.txt | -rw-r--r-- | 11.8 KB |
| switchtec.txt | -rw-r--r-- | 4.0 KB |
| sync_file.txt | -rw-r--r-- | 3.1 KB |
| tee.txt | -rw-r--r-- | 5.2 KB |
| this_cpu_ops.txt | -rw-r--r-- | 11.2 KB |
| unaligned-memory-access.txt | -rw-r--r-- | 10.4 KB |
| vfio-mediated-device.txt | -rw-r--r-- | 14.6 KB |
| vfio.txt | -rw-r--r-- | 21.2 KB |
| video-output.txt | -rw-r--r-- | 1.1 KB |
| xillybus.txt | -rw-r--r-- | 17.6 KB |
| xz.txt | -rw-r--r-- | 5.5 KB |
| zorro.txt | -rw-r--r-- | 2.9 KB |
Computing file changes ...
