Dave Airlie
4410f39109
fbdev: add support for handoff from firmware to hw framebuffers
...
With KMS we have ran into an issue where we really want the KMS fb driver
to be the one running the console, so panics etc can be shown by switching
out of X etc.
However with vesafb/efifb built-in, we end up with those on fb0 and the
KMS fb driver on fb1, driving the same piece of hw, so this adds an fb
info flag to denote a firmware fbdev, and adds a new aperture base/size
range which can be compared when the hw drivers are installed to see if
there is a conflict with a firmware driver, and if there is the firmware
driver is unregistered and the hw driver takes over.
It uses new aperture_base/size members instead of comparing on the fix
smem_start/length, as smem_start/length might for example only cover the
first 1MB of the PCI aperture, and we could allocate the kms fb from 8MB
into the aperture, thus they would never overlap.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Peter Jones <pjones@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-16 19:48:00 -07:00
..
accessibility
acpi
Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-06-10 15:25:41 -07:00
amba
ata
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-06-14 13:46:25 -07:00
atm
auxdisplay
base
mm: remove CONFIG_UNEVICTABLE_LRU config option
2009-06-16 19:47:42 -07:00
block
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
bluetooth
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
cdrom
char
console: make blank timeout value a boot option
2009-06-16 19:47:52 -07:00
clocksource
time: move PIT_TICK_RATE to linux/timex.h
2009-06-16 19:47:27 -07:00
connector
trivial: Kconfig: .ko is normally not included in module names
2009-06-12 18:01:50 +02:00
cpufreq
cpumask: alloc zeroed cpumask for static cpumask_var_ts
2009-06-09 22:30:27 +09:30
cpuidle
crypto
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-06-14 13:46:25 -07:00
dca
dio
dma
edac
trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.
2009-06-12 18:01:46 +02:00
eisa
eisa.ids: add Network Peripherals FDDI boards
2009-06-16 19:47:52 -07:00
firewire
firmware
firmware_map: fix hang with x86/32bit
2009-06-16 19:47:28 -07:00
gpio
gpu
fbdev: add support for handoff from firmware to hw framebuffers
2009-06-16 19:48:00 -07:00
hid
Merge branches 'upstream' and 'ntrig-multitouch' into for-linus
2009-06-12 17:42:13 +02:00
hwmon
lis3: add click function
2009-06-16 19:47:57 -07:00
i2c
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2009-06-15 09:32:52 -07:00
ide
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-06-14 13:46:25 -07:00
idle
ieee1394
fs: Remove i_cindex from struct inode
2009-06-11 21:36:09 -04:00
ieee802154
ieee802154: fix kconfig bool/tristate muckup
2009-06-13 23:36:29 -07:00
infiniband
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
input
time: move PIT_TICK_RATE to linux/timex.h
2009-06-16 19:47:27 -07:00
isdn
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
leds
lguest
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest
2009-06-12 09:32:26 -07:00
macintosh
mca
md
Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block
2009-06-11 11:10:35 -07:00
media
videobuf-dma-contig: zero copy USERPTR support
2009-06-16 19:47:40 -07:00
memstick
message
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
mfd
MFD,mmc: tmio_mmc: make HCLK configurable
2009-06-13 22:42:59 +02:00
misc
page allocator: do not check NUMA node ID when the caller knows the node is valid
2009-06-16 19:47:32 -07:00
mmc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
2009-06-14 13:46:57 -07:00
mtd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-06-14 13:46:25 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-06-15 09:40:05 -07:00
nubus
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-06-15 09:40:05 -07:00
oprofile
parisc
parport
parport_pc: clean up the modified while loops using for
2009-06-11 08:51:03 -07:00
pci
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-06-15 09:40:05 -07:00
pcmcia
use printk_once() in several places
2009-06-16 19:47:50 -07:00
platform
sony-laptop: no need to unblock rfkill on load
2009-06-10 13:28:37 -04:00
pnp
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2009-06-12 18:09:18 -07:00
power
ps3
rapidio
regulator
regulator/max1586: fix V3 gain calculation integer overflow
2009-06-15 11:18:27 +01:00
rtc
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2009-06-14 13:42:43 -07:00
s390
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
sbus
scsi
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
serial
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
sh
sh: Tie sparseirq in to Kconfig.
2009-06-11 10:33:09 +03:00
sn
spi
spi: takes size of a pointer to determine the size of the pointed-to type
2009-06-16 19:47:27 -07:00
ssb
SSB: BCM47xx: Export ssb_watchdog_timer_set
2009-06-08 16:57:50 +01:00
staging
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
tc
telephony
thermal
uio
usb
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
uwb
video
fbdev: add support for handoff from firmware to hw framebuffers
2009-06-16 19:48:00 -07:00
virtio
virtio: enhance id_matching for virtio drivers
2009-06-12 22:16:40 +09:30
vlynq
drivers: add support for the TI VLYNQ bus
2009-06-16 19:47:52 -07:00
w1
trivial: Kconfig: .ko is normally not included in module names
2009-06-12 18:01:50 +02:00
watchdog
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-06-14 13:46:25 -07:00
xen
PM core: rename suspend and resume functions
2009-06-12 21:32:31 +02:00
zorro
Kconfig
drivers: add support for the TI VLYNQ bus
2009-06-16 19:47:52 -07:00
Makefile
drivers: add support for the TI VLYNQ bus
2009-06-16 19:47:52 -07:00