Chris Wilson 27c35c76cd drm/i915: Only apply DPMS to the encoder if enabled ... commit c9976dcf55 upstream. The current test for an attached enabled encoder fails if we have multiple connectors aliased to the same encoder - both connectors believe they own the enabled encoder and so we attempt to both enable and disable DPMS on the encoder, leading to hilarity and an OOPs: [ 354.803064] WARNING: CPU: 0 PID: 482 at /usr/src/linux/dist/3.11.2/drivers/gpu/drm/i915/intel_display.c:3869 intel_modeset_check_state+0x764/0x770 [i915]() [ 354.803064] wrong connector dpms state [ 354.803084] Modules linked in: nfsd auth_rpcgss oid_registry exportfs nfs lockd sunrpc xt_nat iptable_nat nf_nat_ipv4 nf_nat xt_limit xt_LOG xt_tcpudp nf_conntrack_ipv4 nf_defrag_ipv4 ipt_REJECT ipv6 xt_recent xt_conntrack nf_conntrack iptable_filter ip_tables x_tables snd_hda_codec_realtek snd_hda_codec_hdmi x86_pkg_temp_thermal snd_hda_intel coretemp kvm_intel snd_hda_codec i915 kvm snd_hwdep snd_pcm_oss snd_mixer_oss crc32_pclmul snd_pcm crc32c_intel e1000e intel_agp igb ghash_clmulni_intel intel_gtt aesni_intel cfbfillrect aes_x86_64 cfbimgblt lrw cfbcopyarea drm_kms_helper ptp video thermal processor gf128mul snd_page_alloc drm snd_timer glue_helper 8250_pci snd pps_core ablk_helper agpgart cryptd sg soundcore fan i2c_algo_bit sr_mod thermal_sys 8250 i2c_i801 serial_core hwmon cdrom i2c_core evdev button [ 354.803086] CPU: 0 PID: 482 Comm: kworker/0:1 Not tainted 3.11.2 #1 [ 354.803087] Hardware name: Supermicro X10SAE/X10SAE, BIOS 1.00 05/03/2013 [ 354.803091] Workqueue: events console_callback [ 354.803092] 0000000000000009 ffff88023611db48 ffffffff814048ac ffff88023611db90 [ 354.803093] ffff88023611db80 ffffffff8103d4e3 ffff880230d82800 ffff880230f9b800 [ 354.803094] ffff880230f99000 ffff880230f99448 ffff8802351c0e00 ffff88023611dbe0 [ 354.803094] Call Trace: [ 354.803098] [<ffffffff814048ac>] dump_stack+0x54/0x8d [ 354.803101] [<ffffffff8103d4e3>] warn_slowpath_common+0x73/0x90 [ 354.803103] [<ffffffff8103d547>] warn_slowpath_fmt+0x47/0x50 [ 354.803109] [<ffffffffa089f1be>] ? intel_ddi_connector_get_hw_state+0x5e/0x110 [i915] [ 354.803114] [<ffffffffa0896974>] intel_modeset_check_state+0x764/0x770 [i915] [ 354.803117] [<ffffffffa08969bb>] intel_connector_dpms+0x3b/0x60 [i915] [ 354.803120] [<ffffffffa037e1d0>] drm_fb_helper_dpms.isra.11+0x120/0x160 [drm_kms_helper] [ 354.803122] [<ffffffffa037e24e>] drm_fb_helper_blank+0x3e/0x80 [drm_kms_helper] [ 354.803123] [<ffffffff812116c2>] fb_blank+0x52/0xc0 [ 354.803125] [<ffffffff8121e04b>] fbcon_blank+0x21b/0x2d0 [ 354.803127] [<ffffffff81062243>] ? update_rq_clock.part.74+0x13/0x30 [ 354.803129] [<ffffffff81047486>] ? lock_timer_base.isra.30+0x26/0x50 [ 354.803130] [<ffffffff810472b2>] ? internal_add_timer+0x12/0x40 [ 354.803131] [<ffffffff81047f48>] ? mod_timer+0xf8/0x1c0 [ 354.803133] [<ffffffff81266d61>] do_unblank_screen+0xa1/0x1c0 [ 354.803134] [<ffffffff81268087>] poke_blanked_console+0xc7/0xd0 [ 354.803136] [<ffffffff812681cf>] console_callback+0x13f/0x160 [ 354.803137] [<ffffffff81053258>] process_one_work+0x148/0x3d0 [ 354.803138] [<ffffffff81053f19>] worker_thread+0x119/0x3a0 [ 354.803140] [<ffffffff81053e00>] ? manage_workers.isra.30+0x2a0/0x2a0 [ 354.803141] [<ffffffff8105994b>] kthread+0xbb/0xc0 [ 354.803142] [<ffffffff81059890>] ? kthread_create_on_node+0x120/0x120 [ 354.803144] [<ffffffff8140b32c>] ret_from_fork+0x7c/0xb0 [ 354.803145] [<ffffffff81059890>] ? kthread_create_on_node+0x120/0x120 This regression goes back to the big modeset rework and the conversion to the new dpms helpers which started with: commit 5ab432ef49 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Sat Jun 30 08:59:56 2012 +0200 drm/i915/hdmi: convert to encoder->disable/enable Fixes: igt/kms_flip/dpms-off-confusion Reported-and-tested-by: Wakko Warner <wakko@animx.eu.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68030 Link: http://lkml.kernel.org/r/20130928185023.GA21672@animx.eu.org Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> [danvet: Add regression citation, mention the igt testcase this fixes and slap a cc: stable on the patch.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-10-18 07:45:45 -07:00
..
accessibility
acpi	ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()	2013-10-13 16:08:34 -07:00
amba
ata	libata: apply behavioral quirks to sil3826 PMP	2013-08-29 09:47:38 -07:00
atm
auxdisplay
base	driver core : Fix use after free of dev->parent in device_shutdown	2013-10-05 07:13:11 -07:00
bcma	bcma: add more core IDs	2013-05-17 14:31:05 -04:00
block	cciss: fix info leak in cciss_ioctl32_passthru()	2013-10-13 16:08:28 -07:00
bluetooth	Bluetooth: Add support for BCM20702A0 [0b05, 17cb]	2013-10-13 16:08:32 -07:00
bus
cdrom	drivers/cdrom/cdrom.c: use kzalloc() for failing hardware	2013-07-13 11:42:26 -07:00
char	random: run random_int_secret_init() run after all late_initcalls	2013-10-18 07:45:44 -07:00
clk	clk: wm831x: Initialise wm831x pointer on init	2013-09-26 17:18:30 -07:00
clocksource	clocksource: dw_apb: Fix error check	2013-07-25 14:07:29 -07:00
connector
cpufreq	cpufreq: rename ignore_nice as ignore_nice_load	2013-08-14 22:59:06 -07:00
cpuidle	cpuidle: coupled: fix race condition between pokes and safe state	2013-09-26 17:18:02 -07:00
crypto	crypto: caam - Fixed the memory out of bound overwrite issue	2013-08-04 16:50:57 +08:00
dca
devfreq
dio
dma	dmaengine: imx-dma: fix slow path issue in prep_dma_cyclic	2013-10-13 16:08:34 -07:00
edac	amd64_edac: Fix single-channel setups	2013-09-26 17:18:28 -07:00
eisa
extcon	Removal of GENERIC_GPIO for v3.10	2013-05-09 09:59:16 -07:00
firewire	firewire: fix libdc1394/FlyCap2 iso event regression	2013-08-04 16:50:38 +08:00
firmware	efivar: fix oops in efivar_update_sysfs_entries() caused by memory reuse	2013-05-13 20:20:02 +01:00
gpio	gpio/omap: auto-setup a GPIO when used as an IRQ	2013-10-13 16:08:31 -07:00
gpu	drm/i915: Only apply DPMS to the encoder if enabled	2013-10-18 07:45:45 -07:00
hid	HID: uhid: allocate static minor	2013-10-13 16:08:35 -07:00
hsi
hv	Drivers: hv: balloon: Do not post pressure status if interrupted	2013-08-04 16:50:58 +08:00
hwmon	hwmon: (applesmc) Always read until end of data	2013-10-18 07:45:44 -07:00
hwspinlock	A single patch from Vincent extending OMAP's hwspinlock support to OMAP5.	2013-05-07 14:01:27 -07:00
i2c	i2c: omap: Clear ARDY bit twice	2013-10-18 07:45:44 -07:00
ide	block_device_operations->release() should return void	2013-05-07 02:16:21 -04:00
idle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-05-11 15:23:17 -07:00
iio	iio: inkern: fix iio_convert_raw_to_processed_unlocked	2013-07-25 14:07:23 -07:00
infiniband	ib_srpt: always set response for task management	2013-10-13 16:08:33 -07:00
input	HID: Correct the USB IDs for the new Macbook Air 6	2013-09-26 17:18:15 -07:00
iommu	intel-iommu: Fix leaks in pagetable freeing	2013-09-26 17:18:27 -07:00
ipack
irqchip	ARM: SoC fixes for 3.10-rc	2013-06-22 09:44:45 -10:00
isdn	isdn/kcapi: fix a small underflow	2013-05-20 13:38:14 -07:00
leds	leds: wm831x-status: Request a REG resource	2013-09-26 17:18:27 -07:00
lguest	lguest: clear cached last cpu when guest_set_pgd() called.	2013-05-08 10:49:18 +09:30
macintosh	powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)	2013-08-11 18:35:20 -07:00
mailbox
md	bcache: Fix a null ptr deref regression	2013-10-13 16:08:35 -07:00
media	Properly handle tristate dependencies on USB/PCI menus	2013-10-01 09:17:48 -07:00
memory	drivers/memory: don't check resource with devm_ioremap_resource	2013-05-18 11:55:52 +02:00
memstick	block_device_operations->release() should return void	2013-05-07 02:16:21 -04:00
message	Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block	2013-05-08 10:13:35 -07:00
mfd	mfd: tps6586x: correct device name of the regulator cell	2013-06-24 12:37:47 +01:00
misc	mei: cancel stall timers in mei_reset	2013-10-05 07:13:10 -07:00
mmc	mmc: tmio_mmc_dma: fix PIO fallback on SDHI	2013-09-26 17:18:29 -07:00
mtd	mtd: nand: fix NAND_BUSWIDTH_AUTO for x16 devices	2013-09-26 17:18:29 -07:00
net	net: qmi_wwan: add new Qualcomm devices	2013-10-13 16:08:35 -07:00
nfc	NFC: mei: Do not disable MEI devices from their remove routine	2013-05-21 10:48:41 +02:00
ntb	NTB: Multiple NTB client fix	2013-05-15 10:58:22 -07:00
nubus	nubus: Kill nubus_proc_detach_device()	2013-05-04 14:47:26 -04:00
of	of: Fix missing memory initialization on FDT unflattening	2013-09-26 17:18:29 -07:00
oprofile
parisc	parisc: Fix interrupt routing for C8000 serial ports	2013-08-11 18:35:21 -07:00
parport	parisc: parport0: fix this legacy no-device port driver!	2013-06-01 14:46:42 +02:00
pci	PCI / ACPI / PM: Clear pme_poll for devices in D3cold on wakeup	2013-10-01 09:17:45 -07:00
pcmcia	pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status	2013-07-21 18:21:25 -07:00
pinctrl	pinctrl: at91: fix get_pullup/down function return	2013-09-26 17:18:14 -07:00
platform	drivers/platform/olpc/olpc-ec.c: initialise earlier	2013-08-29 09:47:38 -07:00
pnp	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-05-02 10:16:16 -07:00
power	charger-manager: Ensure event is not used as format string	2013-07-13 11:42:26 -07:00
pps	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ps3
ptp	ptp_pch: fix error handling in pch_probe()	2013-05-25 21:24:15 -07:00
pwm	drivers/pwm: don't check resource with devm_ioremap_resource	2013-05-18 11:55:58 +02:00
rapidio	RAPIDIO: IDT_GEN2: Fix build error.	2013-07-28 16:30:07 -07:00
regulator	mfd: tps6586x: correct device name of the regulator cell	2013-06-24 12:37:47 +01:00
remoteproc	This pull request contains:	2013-05-07 14:04:56 -07:00
reset
rpmsg	A small pull request consisting of:	2013-05-07 14:02:00 -07:00
rtc	drivers/rtc/rtc-max77686.c: Fix wrong register	2013-09-14 06:54:57 -07:00
s390	SCSI: zfcp: fix schedule-inside-lock in scsi_device list loops	2013-08-29 09:47:39 -07:00
sbus
scsi	esp_scsi: Fix tag state corruption when autosensing.	2013-10-13 16:08:32 -07:00
sfi
sh
sn
spi	spi: spi-davinci: Fix direction in dma_map_single()	2013-08-11 18:35:25 -07:00
ssb	- Lots of cleanups from Artem, including deletion of some obsolete drivers	2013-05-09 10:15:46 -07:00
ssbi
staging	staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice	2013-10-13 16:08:33 -07:00
target	iscsi-target: Only perform wait_for_tasks when performing shutdown	2013-10-13 16:08:34 -07:00
tc
thermal	drivers/thermal: don't check resource with devm_ioremap_resource	2013-05-18 11:57:30 +02:00
tty	xen/hvc: allow xenboot console to be used again	2013-10-13 16:08:33 -07:00
uio	uio: UIO_DMEM_GENIRQ should depend on HAS_DMA	2013-05-21 10:13:23 -07:00
usb	USB: serial: option: Ignore card reader interface on Huawei E1750	2013-10-13 16:08:33 -07:00
uwb	uwb: rename random32() to prandom_u32()	2013-04-29 18:28:43 -07:00
vfio	vfio: fix crash on rmmod	2013-06-05 08:54:16 -06:00
vhost	vhost_net: poll vhost queue after marking DMA is done	2013-09-14 06:54:56 -07:00
video	atmel_lcdfb: blank the backlight on remove	2013-06-01 03:18:55 +08:00
virt
virtio	virtio: support unlocked queue poll	2013-07-28 16:29:55 -07:00
vlynq
vme
w1	drivers/w1/masters: don't check resource with devm_ioremap_resource	2013-05-18 11:58:03 +02:00
watchdog	watchdog: ts72xx_wdt: locking bug in ioctl	2013-10-18 07:45:45 -07:00
xen	xen-gnt: prevent adding duplicate gnt callbacks	2013-09-26 17:18:02 -07:00
zorro	proc: Supply PDE attribute setting accessor functions	2013-05-01 17:29:18 -04:00
Kconfig	ARM: arm-soc driver changes for 3.10	2013-05-04 12:31:18 -07:00
Makefile	ARM: arm-soc driver changes for 3.10	2013-05-04 12:31:18 -07:00