Dave Airlie b197296179 drm/i915: fix psr match conditions screw ups. ... Not enough brown paper bags, you'll have to share one. (oops below). The initial match condition code was racy (locking is coming I hear). then along came: cd234b0bfd drm/i915: Do not dereference NULL crtc or fb until after checking Chris made an attempt to fix it, Ben "reviewed" it. Daniel merged it. Then drm/i915: Make use of intel_fb_obj() (v2) 2ff8fde1ea made it worse by removing the obj check later. All in all, my laptop can't barely turn off the display without hitting this. Posted to #intel-gfx out of niceness, but I've merged this already into drm-next. Here's an oops. [ 11.528185] BUG: unable to handle kernel NULL pointer dereference at 00000000000000d0 [ 11.528233] IP: [<ffffffffa0161fde>] intel_edp_psr_match_conditions+0x1e/0x2e0 [i915] [ 11.528294] PGD 35bc0067 PUD c997c067 PMD 0 [ 11.528321] Oops: 0000 [#1] SMP [ 11.528916] CPU: 3 PID: 244 Comm: kworker/3:2 Not tainted 3.16.0-rc4+ #17 [ 11.528949] Hardware name: LENOVO 20ARS25701/20ARS25701, BIOS GJET72WW (2.22 ) 02/21/2014 [ 11.529004] Workqueue: events intel_edp_psr_work [i915] [ 11.529031] task: ffff8803079fdaa0 ti: ffff8803079c4000 task.ti: ffff8803079c4000 [ 11.529067] RIP: 0010:[<ffffffffa0161fde>] [<ffffffffa0161fde>] intel_edp_psr_match_conditions+0x1e/0x2e0 [i915] [ 11.529129] RSP: 0018:ffff8803079c7d40 EFLAGS: 00010246 [ 11.529155] RAX: 0000000000000000 RBX: ffff88030c11c000 RCX: c000000000000000 [ 11.529189] RDX: 0000000000000001 RSI: 1df0000000000000 RDI: ffff88030c1190d8 [ 11.529222] RBP: ffff8803079c7d60 R08: ffffffff82691140 R09: 0000000000000000 [ 11.529256] R10: ffff8803079fdaa0 R11: 3e00000000000000 R12: ffff88030c11c728 [ 11.529290] R13: ffff88030c1190d8 R14: ffff88031e2d8e00 R15: 00000000000000c0 [ 11.529324] FS: 0000000000000000(0000) GS:ffff88031e2c0000(0000) knlGS:0000000000000000 [ 11.529361] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 11.529389] CR2: 00000000000000d0 CR3: 00000000c8d9d000 CR4: 00000000001407e0 [ 11.529423] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 11.529457] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 11.529489] Stack: [ 11.529500] ffff88030c119000 ffff88030c11c728 ffff88030c1190d8 ffff88031e2d8e00 [ 11.529541] ffff8803079c7d88 ffffffffa01679b2 ffff880035b29a80 ffff880307909f00 [ 11.529583] ffff88031e2d4740 ffff8803079c7df8 ffffffff810a78ab ffffffff810a7849 [ 11.529624] Call Trace: [ 11.529654] [<ffffffffa01679b2>] intel_edp_psr_work+0x52/0x90 [i915] [ 11.529689] [<ffffffff810a78ab>] process_one_work+0x1db/0x540 [ 11.529719] [<ffffffff810a7849>] ? process_one_work+0x179/0x540 [ 11.529750] [<ffffffff810a81ed>] worker_thread+0x11d/0x520 [ 11.529779] [<ffffffff810a80d0>] ? create_and_start_worker+0x60/0x60 [ 11.529810] [<ffffffff810aeb04>] kthread+0xe4/0x100 [ 11.529836] [<ffffffff810aea20>] ? kthread_create_on_node+0x200/0x200 [ 11.529870] [<ffffffff81705ebc>] ret_from_fork+0x7c/0xb0 [ 11.529896] [<ffffffff810aea20>] ? kthread_create_on_node+0x200/0x200 [ 11.529926] Code: ba 31 13 f0 c9 85 f6 75 84 eb d0 66 90 0f 1f 44 00 00 55 48 89 e5 41 56 41 55 41 54 53 48 8b 87 68 ff ff ff 48 8b 9f 28 ff ff ff <48> 8b 80 d0 00 00 00 4c 8b 63 28 48 8b 40 48 48 85 c0 0f 84 1a [ 11.530110] RIP [<ffffffffa0161fde>] intel_edp_psr_match_conditions+0x1e/0x2e0 [i915] [ 11.530163] RSP <ffff8803079c7d40> [ 11.530180] CR2: 00000000000000d0 Signed-off-by: Dave Airlie <airlied@redhat.com>		2014-07-21 14:00:19 +10:00
..
accessibility
acpi	Merge branches 'acpi-general', 'acpi-processor', 'acpi-lpss' and 'acpi-battery'	2014-06-19 14:40:48 +02:00
amba
ata
atm
auxdisplay
base	DMA, CMA: fix possible memory leak	2014-06-23 16:47:44 -07:00
bcma
block	zram: revalidate disk after capacity change	2014-07-03 09:21:53 -07:00
bluetooth
bus	bus/arm-cci: add dependency on OF && CPU_V7	2014-06-17 17:09:35 +02:00
cdrom
char	random: fix entropy accounting bug introduced in v3.15	2014-06-17 14:23:14 -10:00
clk
clocksource	clocksource: exynos_mct: Don't reset the counter during boot and resume	2014-06-17 00:23:29 +09:00
connector
cpufreq	cpufreq: unlock when failing cpufreq_update_policy()	2014-06-18 21:52:20 +02:00
cpuidle	cpuidle: mvebu: Fix the name of the states	2014-06-18 21:54:46 +02:00
crypto
dca
devfreq
dio
dma
edac
eisa
extcon
firewire
firmware	efi-pstore: Fix an overflow on 32-bit builds	2014-06-27 07:30:32 +01:00
fmc
gpio
gpu	drm/i915: fix psr match conditions screw ups.	2014-07-21 14:00:19 +10:00
hid
hsi
hv
hwmon	hwmon: (gpio-fan) Change name used in hwmon_device_register_with_groups	2014-06-25 15:16:09 -07:00
hwspinlock
i2c	i2c: sun6-p2wi: fix call to snprintf	2014-06-17 14:28:04 +02:00
ide
idle
iio	iio: of_iio_channel_get_by_name() returns non-null pointers for error legs	2014-06-21 12:31:38 +01:00
infiniband
input
iommu	iommu/amd: Fix small race between invalidate_range_end/start	2014-06-20 16:14:22 +02:00
ipack
irqchip	irqchip: spear_shirq: Fix interrupt offset	2014-06-21 23:26:39 +00:00
isdn	isdn: hisax: Drop duplicate Kconfig entry	2014-06-16 21:31:37 -07:00
leds
lguest
macintosh	powerpc/macintosh/smu.c: Fix closing brace followed by if	2014-06-24 12:43:15 +10:00
mailbox
mcb
md	md: flush writes before starting a recovery.	2014-07-03 10:44:45 +10:00
media
memory
memstick	drivers/memstick/host/rtsx_pci_ms.c: add cancel_work when remove driver	2014-06-23 16:47:44 -07:00
message
mfd	mfd: ab8500: Fix dt irq mapping	2014-06-26 13:34:15 +01:00
misc	ARM: SoC fixes for 3.16	2014-06-25 12:19:01 -07:00
mmc
mtd
net	net: allwinner: emac: Add missing free_irq	2014-06-25 16:31:17 -07:00
nfc
ntb
nubus
of	Devicetree bugfixe for v3.16	2014-07-06 12:11:57 -07:00
oprofile
parisc
parport
pci
pcmcia
phy
pinctrl
platform
pnp
power
powercap
pps
ps3
ptp	ptp: ptp_pch depends on x86_32	2014-06-17 15:43:48 -07:00
pwm
rapidio
regulator	Merge remote-tracking branches 'regulator/fix/bcm590xx', 'regulator/fix/palmas' and 'regulator/fix/tps65218' into regulator-linus	2014-06-28 14:01:04 +01:00
remoteproc	remoteproc: da8xx: don't select CMA on no-MMU	2014-06-17 17:09:36 +02:00
reset
rpmsg
rtc	drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0	2014-06-20 08:22:39 +08:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-06-21 06:47:01 -10:00
sbus
scsi	SCSI for-linus on 20140705	2014-07-06 12:08:30 -07:00
sfi
sh
sn
soc
spi	Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/qup' and 'spi/fix/sh-sci' into spi-linus	2014-06-28 14:01:23 +01:00
spmi
ssb
staging	Merge tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel into drm-next	2014-07-08 11:04:35 +10:00
target	iscsi-target: fix iscsit_del_np deadlock on unload	2014-06-27 23:23:35 -07:00
tc	TC: Handle device_register() errors.	2014-06-26 10:48:23 +01:00
thermal
tty	ARM: SoC fixes for 3.16	2014-06-25 12:19:01 -07:00
uio	Revert "uio: fix vma io range check in mmap"	2014-06-17 16:07:08 -07:00
usb	usb: chipidea: udc: delete td from req's td list at ep_dequeue	2014-07-01 23:06:02 -07:00
uwb
vfio
vhost	vhost-scsi: don't open-code kvfree	2014-06-23 09:22:48 +03:00
video	fb: adv7393: add missing semicolon	2014-07-01 13:18:38 +03:00
virt
virtio
vlynq
vme
w1	w1: mxc_w1: Fix incorrect "presence" status	2014-06-19 17:51:46 -07:00
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-06-21 06:47:01 -10:00
xen	xen: regression and PVH fixes for 3.16-rc1	2014-06-19 07:53:27 -10:00
zorro
Kconfig
Makefile