Ville Syrjälä
a459249c73
drm/i915: Skip load detect when intel_crtc->new_enable==true ...
During suspend we turn off the crtcs, but leave the staged config in
place so that we can restore the display(s) to their previous state on
resume.
During resume when we attempt to apply the force pipe A quirk we use the
load detect mechanism. That doesn't check whether there was an already
staged configuration for the crtc since that's not even possible during
normal runtime load detection. But during resume it is possible, and if
we just blindly go and overwrite the staged crtc configuration for the
load detection we can no longer restore the display to the correct
state.
Even worse, we don't even clear all the staged connector->encoder->crtc
links so we may end up using a cloned setup for the load detection, and
after we're done we just clear the links related to the VGA output
leaving the links for the other outputs in place. This will eventually
result in calling intel_set_mode() with mode==NULL but with valid
connector->encoder->crtc links which will result in dereferencing the
NULL mode since the code thinks it will have to a modeset.
To avoid these problems don't use any crtc with new_enabled==true for
load detection.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: stable@vger.kernel.org (for 3.16)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-08-18 10:42:41 +03:00
More ACPI and power management updates for 3.17-rc1
2014-08-14 18:13:46 -06:00
Merge branch 'akpm' (patchbomb from Andrew Morton)
2014-08-06 21:14:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-13 18:27:40 -06:00
Merge branch 'akpm' (patchbomb from Andrew Morton)
2014-08-06 21:14:42 -07:00
bcma: use NS prefix for names of Northstar specific cores
2014-07-31 13:45:32 -04:00
PCI changes for the v3.17 merge window (part 2):
2014-08-14 18:10:33 -06:00
Bluetooth: Fix crash in the Marvell driver initialization codepath
2014-07-31 01:07:28 +02:00
ARM: SoC driver changes for 3.17
2014-08-08 11:34:32 -07:00
virtio: rng: add derating factor for use by hwrng core
2014-08-15 10:26:01 +05:30
ARM: SoC platform changes for 3.17
2014-08-08 11:14:29 -07:00
ARM: SoC platform changes for 3.17
2014-08-08 11:14:29 -07:00
More ACPI and power management updates for 3.17-rc1
2014-08-14 18:13:46 -06:00
More ACPI and power management updates for 3.17-rc1
2014-08-14 18:13:46 -06:00
PCI changes for the v3.17 merge window (part 2):
2014-08-14 18:10:33 -06:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-08-11 07:14:01 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2014-08-15 17:56:45 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
kexec: support kexec/kdump on EFI systems
2014-08-08 15:57:33 -07:00
This is the bulk of GPIO changes for the v3.17 development
2014-08-08 18:00:35 -07:00
drm/i915: Skip load detect when intel_crtc->new_enable==true
2014-08-18 10:42:41 +03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-08-15 18:16:28 -06:00
HSI changes for the v3.17 series
2014-08-06 20:06:14 -07:00
Char / Misc driver patches for 3.17-rc1
2014-08-04 17:32:24 -07:00
Several bug fixes in various drivers, plus a minor cleanup
2014-08-14 09:55:13 -06:00
Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-08-09 09:15:07 -07:00
ide: use module_platform_driver()
2014-08-05 21:16:46 -07:00
intel_idle: Broadwell support
2014-08-15 17:06:40 -04:00
Staging driver patches for 3.17-rc1
2014-08-04 18:36:12 -07:00
PCI changes for the v3.17 merge window (part 2):
2014-08-14 18:10:33 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-08-15 18:16:28 -06:00
ARM: SoC cleanups for 3.17
2014-08-08 11:00:26 -07:00
ARM: SoC platform changes for 3.17
2014-08-08 11:14:29 -07:00
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
ARM: SoC driver changes for 3.17
2014-08-08 11:34:32 -07:00
mm/vmalloc.c: clean up map_vm_area third argument
2014-08-06 18:01:19 -07:00
== Changes to existing drivers ==
2014-08-07 17:23:16 -07:00
. Allow the thin target to paired with any size external origin; also
2014-08-14 09:17:56 -06:00
media: use pci_zalloc_consistent
2014-08-08 15:57:28 -07:00
drivers/mfd/rtsx_usb.c: export device table
2014-08-14 10:56:15 -06:00
ARM: SoC driver changes for 3.17
2014-08-08 11:34:32 -07:00
PCI changes for the v3.17 merge window (part 2):
2014-08-14 18:10:33 -06:00
No significant changes, mostly small fixes here and there. The more important
2014-08-13 17:42:11 -06:00
PCI changes for the v3.17 merge window (part 2):
2014-08-14 18:10:33 -06:00
The branch contains the following device tree changes the v3.17 merge
2014-08-14 09:53:39 -06:00
drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO
2014-08-08 15:57:25 -07:00
PCI changes for the v3.17 merge window (part 2):
2014-08-14 18:10:33 -06:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-08-07 08:50:34 -07:00
ARM: SoC driver changes for 3.17
2014-08-08 11:34:32 -07:00
ARM: SoC driver changes for 3.17
2014-08-08 11:34:32 -07:00
platform/x86: Enable build support for toshiba_haps
2014-08-16 01:23:56 -07:00
ARM: SoC platform changes for 3.17
2014-08-08 11:14:29 -07:00
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-12 12:15:14 -06:00
pwm: Changes for v3.17-rc1
2014-08-08 18:06:29 -07:00
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-12 12:15:14 -06:00
== Changes to existing drivers ==
2014-08-07 17:17:39 -07:00
Merge branch 'akpm' (second patchbomb from Andrew Morton)
2014-08-08 15:57:47 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-08-07 08:41:00 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2014-08-05 18:57:18 -07:00
SCSI misc on 20140815
2014-08-15 18:28:58 -06:00
ARM: SoC cleanups for 3.17
2014-08-08 11:00:26 -07:00
Merge branch 'akpm' (second patchbomb from Andrew Morton)
2014-08-08 15:57:47 -07:00
SCSI misc on 20140806
2014-08-06 20:10:32 -07:00
The branch contains the following device tree changes the v3.17 merge
2014-08-14 09:53:39 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-08-06 21:03:53 -07:00
uwb/whci: use correct structure type name in sizeof
2014-08-01 15:48:08 -07:00
drivers/vfio: Enable VFIO if EEH is not supported
2014-08-08 10:39:16 -06:00
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-12 12:15:14 -06:00
vme: bridges: use pci_zalloc_consistent
2014-08-08 15:57:30 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-08-07 08:47:00 -07:00
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2014-08-12 12:15:14 -06:00
Char / Misc driver patches for 3.17-rc1
2014-08-04 17:32:24 -07:00
Driver core patches for 3.17-rc1
2014-08-04 18:34:04 -07:00
a459249c73