Daniel Vetter
7f6658ef35
drm/i915: VGA needs to be on pipe A on i830M ...
The bit doesn't stick, and the output is always cloned from pipe A,
even when it's supposed to scan out from pipe B.
Shuts up annoying warnings from the modeset-rework, too.
I've noticed that with this patch we know get and unknown connection
state since the code can't find a suitable pipe for load detection.
But that beats the previous state of affairs, where it tried to use
pipe B, actually used pipe A and concluded that something is connected
(although it's the LVDS on pipe A and nothing on the VGA connector on
pipe B).
I've tried to make load detect work by remapping the pipe->planes
stuff, so that crtc 0 will use pipe B and hence we still have
something left for load-detect on pipe A. But alas, that upset the hw
a bit.
So there's still some things to figure out, but this here will at
least paper over some of the problems.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51265
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: extend the commit message a bit with recent observations.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-10-23 13:03:01 +02:00
ACPI: Reorder IPMI driver before any other ACPI drivers
2012-10-16 18:07:12 -07:00
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2012-10-16 18:14:31 -07:00
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
cpufreq: OMAP: use get_cpu_device() instead of omap_device API
2012-10-08 14:58:56 -07:00
ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
2012-10-08 22:52:54 -04:00
ARM: soc: late platform updates
2012-10-07 20:55:16 +09:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2012-10-09 18:26:28 +02:00
firmware/memmap: avoid type conflicts with the generic memmap_init()
2012-10-19 14:07:47 -07:00
gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
2012-10-17 17:40:18 +00:00
drm/i915: VGA needs to be on pipe A on i830M
2012-10-23 13:03:01 +02:00
Merge branch 'next' into for-linus
2012-10-11 00:45:21 -07:00
hwmon: (coretemp) Add support for Atom CE4110/4150/4170
2012-10-14 15:21:33 -07:00
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +09:00
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-13 10:56:03 +09:00
IOMMU Updates for Linux v3.7-rc1
2012-10-08 06:33:44 +09:00
isdn: fix a wrapping bug in isdn_ppp_ioctl()
2012-10-10 22:50:45 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-10-10 20:14:07 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
md updates for 3.7
2012-10-13 13:22:01 -07:00
[media] Kconfig: Fix dependencies for driver autoselect options
2012-10-17 16:45:56 -03:00
1. New drivers:
2012-10-07 17:29:24 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
mmc: mxs-mmc: Fix merge issue causing build error
2012-10-11 17:21:40 -04:00
mtd: Disable mtdchar mmap on MMU systems
2012-10-09 15:08:42 +01:00
bnx2x: fix handling mf storage modes
2012-10-16 14:41:47 -04:00
of/platform: sparse fix
2012-10-17 15:53:03 -05:00
mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
2012-10-09 16:22:18 +09:00
Xtensa patchset for 3.7
2012-10-09 16:11:46 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
pinctrl/nomadik: always use the simple irqdomain
2012-10-15 09:09:27 +02:00
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
2012-10-09 01:47:35 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
rapidio: update for destination ID allocation
2012-10-11 08:50:15 +09:00
MFD bits for the 3.7 merge window.
2012-10-05 12:01:30 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
2012-10-11 08:50:16 +09:00
qeth: fix deadlock between recovery and bonding driver
2012-10-16 14:41:46 -04:00
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
sh: Fix up more fallout from pointless ARM __iomem churn.
2012-10-15 14:08:48 +09:00
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
staging: dgrp: check return value of alloc_tty_driver
2012-10-17 14:10:10 -07:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
thermal, cpufreq: Fix build when CPU_FREQ_TABLE isn't configured
2012-10-15 14:00:07 -07:00
TTY fixes for 3.7-rc2
2012-10-19 11:28:59 -07:00
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
ARM: soc: Fixes for 3.7-rc2
2012-10-19 17:32:37 -07:00
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
2012-10-19 14:07:47 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2012-10-07 21:06:10 +09:00
xen: Fix annoying compile-time warning
2012-10-19 11:54:21 -07:00
IPMI: Change link order
2012-10-16 18:07:12 -07:00
7f6658ef35