Alex Deucher
08d075116d
drm/radeon/kms: fix tv dac conflict resolver ...
On systems with the tv dac shared between DVI and TV,
we can only use the dac for one of the connectors.
However, when using a digital monitor on the DVI port,
you can use the dac for the TV connector just fine.
Check the use_digital status when resolving the conflict.
Fixes fdo bug 27649, possibly others.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-04-19 11:59:58 +10:00
backlight: Allow properties to be passed at registration
2010-03-16 19:47:54 +00:00
ahci: pp->active_link is not reliable when FBS is enabled
2010-03-17 15:54:55 -04:00
atm: use for_each_set_bit()
2010-03-15 16:00:47 -07:00
auxdisplay: move cfag12864bfb's probe function to .devinit.text
2010-03-07 17:04:50 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2010-03-19 13:39:42 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-03-19 13:40:03 -07:00
MFGPT: move clocksource menu
2010-03-06 11:26:28 -08:00
Driver core: Constify struct sysfs_ops in struct kobj_type
2010-03-07 17:04:49 -08:00
Driver core: Constify struct sysfs_ops in struct kobj_type
2010-03-07 17:04:49 -08:00
Merge branch 'for-next' into for-linus
2010-03-08 16:55:37 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
edac: e752x: add dram scrubbing support
2010-03-12 15:52:40 -08:00
eisa: fix coding style for eisa bus code
2010-03-06 11:26:32 -08:00
Driver core: create lock/unlock functions for struct device
2010-03-07 17:04:52 -08:00
Driver core: Constify struct sysfs_ops in struct kobj_type
2010-03-07 17:04:49 -08:00
driver-core: Add attribute argument to class_attribute show/store
2010-03-07 17:04:48 -08:00
drm/radeon/kms: fix tv dac conflict resolver
2010-04-19 11:59:58 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2010-03-18 16:52:31 -07:00
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-03-06 11:33:09 -08:00
Add include to i2c-xii.c to fix build error
2010-03-14 11:14:58 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
2010-03-04 08:24:06 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2010-03-19 13:39:42 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-03-14 11:13:54 -07:00
gigaset: fix build failure
2010-03-17 14:22:07 -07:00
leds: Fix race between LED device uevent and actual attributes creation
2010-03-16 20:27:25 +00:00
backlight: Allow properties to be passed at registration
2010-03-16 19:47:54 +00:00
Merge branch 'for-linus' of git://neil.brown.name/md
2010-03-18 16:55:24 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-03-14 11:13:54 -07:00
Merge branch 'for-next' into for-linus
2010-03-08 16:55:37 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2010-03-12 16:41:09 -08:00
init dynamic bin_attribute structures
2010-03-14 20:28:39 -07:00
Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
2010-03-12 16:21:24 -08:00
Delete zero-length file drivers/mtd/maps/omap_nor.c
2010-03-19 14:25:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2010-03-19 13:39:42 -07:00
Driver core: Constify struct sysfs_ops in struct kobj_type
2010-03-07 17:04:49 -08:00
Merge branch 'for-next' into for-linus
2010-03-08 16:55:37 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2010-03-19 13:39:42 -07:00
PCMCIA: resource, fix lock imbalance
2010-03-16 17:54:58 +01:00
backlight: panasonic-laptop - Fix incomplete registration failure handling
2010-03-16 20:13:31 +00:00
PNPACPI: add bus number support
2010-03-14 20:08:38 -04:00
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
2010-03-14 21:30:17 -04:00
pps: serial clients support
2010-03-12 15:52:43 -08:00
regulator: Add max8925 support
2010-03-07 22:17:08 +01:00
init dynamic bin_attribute structures
2010-03-14 20:28:39 -07:00
memory hotplug/s390: set phys_device
2010-03-17 18:43:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-03-18 16:54:31 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2010-03-19 18:16:20 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2010-03-19 18:16:20 -07:00
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
2010-03-18 17:01:19 -07:00
backlight: Allow properties to be passed at registration
2010-03-16 19:47:54 +00:00
UIO: Remove SMX Cryptengine driver
2010-03-07 17:04:51 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-03-19 13:40:03 -07:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
2010-03-19 18:14:22 -07:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2010-03-18 16:59:10 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-03-12 16:04:50 -08:00
[WATCHDOG] i6300esb.c: change platform_driver to pci_driver
2010-03-08 13:48:01 +00:00
Driver core: Constify struct sysfs_ops in struct kobj_type
2010-03-07 17:04:49 -08:00
MFGPT: move clocksource menu
2010-03-06 11:26:28 -08:00
Merge branch 'origin' into devel-stable
2010-03-08 20:21:04 +00:00
08d075116d