Maarten Lankhorst a0ffc51e20 drm/atomic: If the atomic check fails, return its value first ... The last part of drm_atomic_check_only is testing whether we need to fail with -EINVAL when modeset is not allowed, but forgets to return the value when atomic_check() fails first. This results in -EDEADLK being replaced by -EINVAL, and the sanity check in drm_modeset_drop_locks kicks in: [ 308.531734] ------------[ cut here ]------------ [ 308.531791] WARNING: CPU: 0 PID: 1886 at drivers/gpu/drm/drm_modeset_lock.c:217 drm_modeset_drop_locks+0x33/0xc0 [drm] [ 308.531828] Modules linked in: [ 308.532050] CPU: 0 PID: 1886 Comm: kms_atomic Tainted: G U W 4.13.0-rc5-patser+ #5225 [ 308.532082] Hardware name: NUC5i7RYB, BIOS RYBDWi35.86A.0246.2015.0309.1355 03/09/2015 [ 308.532124] task: ffff8800cd9dae00 task.stack: ffff8800ca3b8000 [ 308.532168] RIP: 0010:drm_modeset_drop_locks+0x33/0xc0 [drm] [ 308.532189] RSP: 0018:ffff8800ca3bf980 EFLAGS: 00010282 [ 308.532211] RAX: dffffc0000000000 RBX: ffff8800ca3bfaf8 RCX: 0000000013a171e6 [ 308.532235] RDX: 1ffff10019477f69 RSI: ffffffffa8ba4fa0 RDI: ffff8800ca3bfb48 [ 308.532258] RBP: ffff8800ca3bf998 R08: 0000000000000000 R09: 0000000000000003 [ 308.532281] R10: 0000000079dbe066 R11: 00000000f760b34b R12: 0000000000000001 [ 308.532304] R13: dffffc0000000000 R14: 00000000ffffffea R15: ffff880096889680 [ 308.532328] FS: 00007ff00959cec0(0000) GS:ffff8800d4e00000(0000) knlGS:0000000000000000 [ 308.532359] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 308.532380] CR2: 0000000000000008 CR3: 00000000ca2e3000 CR4: 00000000003406f0 [ 308.532402] Call Trace: [ 308.532440] drm_mode_atomic_ioctl+0x19fa/0x1c00 [drm] [ 308.532488] ? drm_atomic_set_property+0x1220/0x1220 [drm] [ 308.532565] ? avc_has_extended_perms+0xc39/0xff0 [ 308.532593] ? lock_downgrade+0x610/0x610 [ 308.532640] ? drm_atomic_set_property+0x1220/0x1220 [drm] [ 308.532680] drm_ioctl_kernel+0x154/0x1a0 [drm] [ 308.532755] drm_ioctl+0x624/0x8f0 [drm] [ 308.532858] ? drm_atomic_set_property+0x1220/0x1220 [drm] [ 308.532976] ? drm_getunique+0x210/0x210 [drm] [ 308.533061] do_vfs_ioctl+0xd92/0xe40 [ 308.533121] ? ioctl_preallocate+0x1b0/0x1b0 [ 308.533160] ? selinux_capable+0x20/0x20 [ 308.533191] ? do_fcntl+0x1b1/0xbf0 [ 308.533219] ? kasan_slab_free+0xa2/0xb0 [ 308.533249] ? f_getown+0x4b/0xa0 [ 308.533278] ? putname+0xcf/0xe0 [ 308.533309] ? security_file_ioctl+0x57/0x90 [ 308.533342] SyS_ioctl+0x4e/0x80 [ 308.533374] entry_SYSCALL_64_fastpath+0x18/0xad [ 308.533405] RIP: 0033:0x7ff00779e4d7 [ 308.533431] RSP: 002b:00007fff66a043d8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 308.533481] RAX: ffffffffffffffda RBX: 000000e7c7ca5910 RCX: 00007ff00779e4d7 [ 308.533560] RDX: 00007fff66a04430 RSI: 00000000c03864bc RDI: 0000000000000003 [ 308.533608] RBP: 00007ff007a5fb00 R08: 000000e7c7ca4620 R09: 000000e7c7ca5e60 [ 308.533647] R10: 0000000000000001 R11: 0000000000000246 R12: 0000000000000070 [ 308.533685] R13: 0000000000000000 R14: 0000000000000000 R15: 000000e7c7ca5930 [ 308.533770] Code: ff df 55 48 89 e5 41 55 41 54 53 48 89 fb 48 83 c7 50 48 89 fa 48 c1 ea 03 80 3c 02 00 74 05 e8 94 d4 16 e7 48 83 7b 50 00 74 02 <0f> ff 4c 8d 6b 58 48 b8 00 00 00 00 00 fc ff df 4c 89 ea 48 c1 [ 308.534086] ---[ end trace 77f11e53b1df44ad ]--- Solve this by adding the missing return. This is also a bugfix because we could end up rejecting updates with -EINVAL because of a early -EDEADLK, while if atomic_check ran to completion it might have downgraded the modeset to a fastset. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Testcase: kms_atomic Link: https://patchwork.freedesktop.org/patch/msgid/20170815095706.23624-1-maarten.lankhorst@linux.intel.com Fixes: d34f20d6e2 ("drm: Atomic modeset ioctl") Cc: <stable@vger.kernel.org> # v4.0+ Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2017-08-15 12:38:05 +02:00
..
accessibility	…
acpi	tty/serial fixes for 4.13-rc5	2017-08-13 12:33:35 -07:00
amba	…
android	binder: Use wake up hint for synchronous transactions.	2017-07-17 14:44:19 +02:00
ata	libata: fix a couple of doc build warnings	2017-07-31 08:03:06 -07:00
atm	atm: zatm: Fix an error handling path in 'zatm_init_one()'	2017-07-18 11:37:46 -07:00
auxdisplay	…
base	driver core fixes for 4.13-rc5	2017-08-13 12:44:18 -07:00
bcma	…
block	zram: rework copy of compressor name in comp_algorithm_store()	2017-08-10 15:54:07 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-07-05 12:31:59 -07:00
bus	bus: uniphier-system-bus: set up registers when resuming	2017-08-04 12:57:18 +02:00
cdrom	block: don't set bounce limit in blk_init_queue	2017-06-27 12:13:45 -06:00
char	random: fix warning message on ia64 and parisc	2017-08-08 09:36:46 -07:00
clk	clk: keystone: sci-clk: Fix sci_clk_get	2017-08-02 18:37:26 -07:00
clocksource	clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly	2017-07-17 22:43:00 +02:00
connector	…
cpufreq	Merge branches 'pm-cpufreq-x86', 'pm-cpufreq-docs' and 'intel_pstate'	2017-08-03 20:29:24 +02:00
cpuidle	powerpc/powernv/idle: Disable LOSE_FULL_CONTEXT states when stop-api fails	2017-08-08 20:21:23 +10:00
crypto	crypto: inside-secure - fix the sha state length in hmac_sha1_setkey	2017-08-03 13:36:11 +08:00
dax	- A few DM integrity fixes that improve performance. One that address	2017-07-28 12:17:17 -07:00
dca	…
devfreq	PM / devfreq: constify attribute_group structures.	2017-07-06 10:17:24 +09:00
dio	…
dma	dmaengine updates for 4.13-rc1	2017-07-08 12:36:50 -07:00
dma-buf	dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence	2017-07-31 10:55:24 -03:00
edac	EDAC, pnd2: Fix Apollo Lake DIMM detection	2017-06-29 10:37:50 +02:00
eisa	…
extcon	…
firewire	…
firmware	efi: avoid fortify checks in EFI stub	2017-07-12 16:26:02 -07:00
fmc	…
fpga	…
fsi	drivers/fsi: fix fsi_slave_mode prototype	2017-07-17 16:13:54 +02:00
gpio	gpio: tegra: fix unbalanced chained_irq_enter/exit	2017-08-02 10:42:38 +02:00
gpu	drm/atomic: If the atomic check fails, return its value first	2017-08-15 12:38:05 +02:00
hid	HID: ortek: add one more buggy device	2017-07-24 17:38:21 +02:00
hsi	HSI changes for the v4.13 series	2017-07-04 14:28:22 -07:00
hv	vmbus: re-enable channel tasklet	2017-07-17 15:00:47 +02:00
hwmon	hwmon: (applesmc) Avoid buffer overruns	2017-07-15 16:38:56 -07:00
hwspinlock	…
hwtracing	Char/Misc patches for 4.13-rc1	2017-07-03 20:55:59 -07:00
i2c	i2c: allow i2c-versatile for ARM MPS platforms	2017-07-31 17:05:16 +02:00
ide	ide: avoid warning for timings calculation	2017-07-21 04:37:22 +01:00
idle	intel_idle: Use more common logging style	2017-06-29 22:58:35 +02:00
iio	First set of IIO fixes for the 4.13 cycle.	2017-07-23 20:54:31 -07:00
infiniband	IPoIB fixes for 4.13	2017-08-07 13:30:40 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2017-07-14 22:53:37 -07:00
iommu	iommu/arm-smmu: fix null-pointer dereference in arm_smmu_add_device	2017-08-11 16:56:51 +02:00
ipack	…
irqchip	irqchip/digicolor: Drop unnecessary static	2017-07-18 21:59:23 +02:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 10:14:04 -07:00
leds	LED updates for 4.13	2017-07-06 11:32:40 -07:00
lguest	…
lightnvm	lightnvm: pblk: advance bio according to lba index	2017-07-28 08:06:00 -06:00
macintosh	Merge branch 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-07-05 13:13:32 -07:00
mailbox	mailbox: pcc: Fix crash when request PCC channel 0	2017-07-26 02:11:47 +02:00
mcb	…
md	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md	2017-07-28 12:24:21 -07:00
media	media: platform: davinci: drop VPFE_CMD_S_CCDC_RAW_PARAMS	2017-07-26 06:14:33 -04:00
memory	ARM: SoC driver updates	2017-07-04 14:47:47 -07:00
memstick	…
message	…
mfd	chrome-platform-for-linus-4.13	2017-07-11 09:55:47 -07:00
misc	mei: exclude device from suspend direct complete optimization	2017-08-10 14:13:18 -07:00
mmc	mmc: block: fix lockdep splat when removing mmc_block module	2017-08-09 13:19:44 +02:00
mtd	mtd: blkdevs: Fix mtd block write failure	2017-08-12 14:53:24 -07:00
mux	mux: mux-core: unregister mux_class in mux_exit()	2017-07-17 16:38:35 +02:00
net	geneve: maximum value of VNI cannot be used	2017-08-09 22:41:04 -07:00
nfc	NFC 4.13 pull request	2017-07-01 14:30:39 -07:00
ntb	ntb: Add error path/handling to Debug FS entry creation	2017-07-06 11:30:08 -04:00
nubus	…
nvdimm	libnvdimm: fix badblock range handling of ARS range	2017-07-17 11:43:58 -07:00
nvme	nvme: fix directive command numd calculation	2017-08-10 19:53:44 +02:00
nvmem	nvmem: rockchip-efuse: amend compatible rk322x-efuse to rk3228-efuse	2017-07-17 16:15:57 +02:00
of	Merge remote-tracking branches 'asoc/fix/dpcm', 'asoc/fix/imx', 'asoc/fix/msm8916', 'asoc/fix/multi-pcm', 'asoc/fix/of-graph' and 'asoc/fix/pxa' into asoc-linus	2017-08-01 15:17:06 +01:00
oprofile	…
parisc	parisc: pdc_stable: Fix locking when creating sysfs links	2017-07-31 16:43:13 +02:00
parport	…
pci	PCI: Add pci_reset_function_locked()	2017-08-01 20:11:02 -05:00
pcmcia	…
perf	drivers/perf: arm_pmu: Request PMU SPIs with IRQF_PER_CPU	2017-07-27 13:43:22 +01:00
phy	phy: bcm-ns-usb3: fix MDIO_BUS dependency	2017-07-27 17:20:19 -07:00
pinctrl	Pin control fixes for the v4.13 cycle:	2017-08-09 14:30:34 -07:00
platform	platform/x86: intel-vbtn: match power button on press rather than release	2017-08-05 14:37:19 -07:00
pnp	This is the bulk of GPIO changes for the v4.13 series:	2017-07-07 12:40:27 -07:00
power	power supply and reset changes for the v4.13 series (part 2)	2017-07-13 11:47:59 -07:00
powercap	powercap/RAPL: prevent overridding bits outside of the mask	2017-06-28 00:38:34 +02:00
pps	…
ps3	…
ptp	ptp: introduce ptp auxiliary worker	2017-08-01 15:22:55 -07:00
pwm	pwm: Changes for v4.13-rc1	2017-07-13 11:49:52 -07:00
rapidio	…
ras	arm64 updates for 4.13:	2017-07-05 17:09:27 -07:00
regulator	Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next	2017-07-03 16:52:21 +01:00
remoteproc	remoteproc/keystone: Fix circular dependencies for ARM configs	2017-06-27 16:21:34 -07:00
reset	ARM: SoC driver updates	2017-07-04 14:47:47 -07:00
rpmsg	rpmsg updates for v4.13	2017-07-06 15:38:31 -07:00
rtc	RTC for 4.13	2017-07-13 12:15:06 -07:00
s390	s390/qeth: fix L3 next-hop in xmit qeth hdr	2017-08-07 11:24:37 -07:00
sbus	sbus: Convert to using %pOF instead of full_name	2017-07-20 12:37:10 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2017-08-12 12:08:59 -07:00
sfi	…
sh	drivers/sh/intc/virq.c: delete an error message for a failed memory allocation in add_virq_to_pirq()	2017-07-06 16:24:30 -07:00
sn	…
soc	soc: zte: Restrict SOC_ZTE to ARCH_ZX or COMPILE_TEST	2017-07-27 13:12:34 +02:00
spi	Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-07-08 10:41:53 -07:00
spmi	spmi: pmic-arb: Always allocate ppid_to_apid table	2017-07-17 15:00:47 +02:00
ssb	…
staging	staging/iio fixes for 4.13-rc5	2017-08-13 12:30:17 -07:00
target	target: Fix node_acl demo-mode + uncached dynamic shutdown regression	2017-08-09 20:55:19 -07:00
tc	…
tee	…
thermal	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2017-07-14 13:12:32 -07:00
thunderbolt	char/misc fixes for 4.13-rc5	2017-08-13 12:41:58 -07:00
tty	tty/serial fixes for 4.13-rc5	2017-08-13 12:33:35 -07:00
uio	…
usb	USB fixes for 4.13-rc5	2017-08-13 12:27:42 -07:00
uwb	driver core patches for 4.13-rc1	2017-07-03 20:27:48 -07:00
vfio	vfio/pci: Fix handling of RC integrated endpoint PCIe capability size	2017-07-27 10:39:33 -06:00
vhost	Revert "vhost: cache used event for better performance"	2017-07-29 14:15:56 -07:00
video	efifb: allow user to disable write combined mapping.	2017-07-31 18:45:41 +02:00
virt	…
virtio	virtio-balloon: coding format cleanup	2017-07-25 16:37:35 +03:00
vlynq	…
vme	…
w1	w1: omap-hdq: fix error return code in omap_hdq_probe()	2017-07-17 16:48:15 +02:00
watchdog	Merge git://www.linux-watchdog.org/linux-watchdog	2017-07-11 09:59:37 -07:00
xen	xen/events: Fix interrupt lost during irq_disable and irq_enable	2017-08-11 16:46:01 +02:00
zorro	…
Kconfig	…
Makefile	…