Ville Syrjälä aecd36b8a1 drm/i915: Fix deadlock witha the pipe A quirk during resume ...

Pass down the correct acquire context to the pipe A quirk load detect
hack during display resume. Avoids deadlocking the entire thing.

Cc: stable@vger.kernel.org
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: e2c8b8701e ("drm/i915: Use atomic helpers for suspend, v2.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170601143619.27840-2-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

2017-06-15 15:19:32 +03:00

..

accessibility

…

acpi

Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-05-27 09:06:43 -07: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 branch 'for-linus' of git://git.kernel.dk/linux-block

2017-05-20 16:12:30 -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

drivers: char: mem: Check for address space wraparound with mmap()

2017-05-18 16:53:55 +02: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 branches 'intel_pstate', 'pm-cpufreq' and 'pm-cpufreq-sched'

2017-05-22 20:28:22 +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

Merge tag 'dmaengine-4.12-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2017-05-09 15:40:28 -07:00

dma-buf

dma-buf/sync-file: Defer creation of sync_file->name

2017-05-24 13:08:29 -03:00

edac

EDAC, amd64: Fix reporting of Chip Select sizes on Fam17h

2017-05-03 16:27:36 +02:00

eisa

…

extcon

…

firewire

…

firmware

Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

2017-05-22 19:31:07 -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: Fix deadlock witha the pipe A quirk during resume

2017-06-15 15:19:32 +03:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2017-05-02 19:09:35 -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: (coretemp) Handle frozen hotplug state correctly

2017-05-14 07:49:32 -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

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2017-05-12 11:44:13 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2017-05-26 16:45:13 -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 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

2017-05-18 12:04:41 -07:00

media

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

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

misc: pci_endpoint_test: select CRC32

2017-05-16 23:05:40 +02: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

Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs

2017-05-13 10:23:12 -07: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

nubus: Clean up whitespace

2017-04-20 09:54:24 +02:00

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

Annotate hardware config module parameters in drivers/parport/

2017-04-20 12:02:32 +01:00

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

…

phy

…

pinctrl

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2017-05-02 19:09:35 -07: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-05-24 20:29:53 -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

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2017-05-12 11:44:13 -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

serial: altera_uart: call iounmap() at driver remove

2017-05-25 14:36:37 +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