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
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2009-06-14 13:42:43 -07:00
can: sja1000: generic OF platform bus driver
2009-06-01 02:53:35 -07:00
isdn: rename capi_ctr_reseted() to capi_ctr_down()
2009-06-08 00:45:50 -07:00
MFD,mmc: tmio_mmc: make HCLK configurable
2009-06-13 22:42:59 +02:00
IB/mlx4: Add strong ordering to local inval and fast reg work requests
2009-06-05 10:36:24 -07:00
libertas: add support for Marvell SD8688 chip
2009-04-22 16:54:41 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-06-11 16:00:49 +02:00
switch rqst_exp_parent()
2009-06-11 21:36:00 -04:00
regulator/max1586: support increased V3 voltage range
2009-06-15 11:18:26 +01:00
net/libertas: remove GPIO-CS handling in SPI interface code
2009-06-10 13:27:50 -04:00
SUNRPC: Fix the problem of EADDRNOTAVAIL syslog floods on reconnect
2009-05-02 16:35:08 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
wimax/i2400m: rename misleading I2400M_PL_PAD to I2400M_PL_ALIGN
2009-06-11 03:30:20 -07:00
irq: change ACPI GSI APIs to also take a device argument
2009-04-28 12:21:17 +02:00
libata: Media rotation rate and form factor heuristics
2009-05-15 14:14:56 -04:00
headers_check fix: linux/auto_fs.h
2009-06-01 06:21:13 +00:00
alpha: binfmt_aout fix
2009-05-02 15:36:10 -07:00
block: Use accessor functions for queue limits
2009-05-22 23:22:54 +02:00
bitops: Add __ffs64 bitop
2009-04-23 10:06:35 +01:00
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
2009-06-12 09:29:42 -07:00
tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK
2009-06-10 11:55:06 +02:00
headers: move module_bug_finalize()/module_bug_cleanup() definitions into module.h
2009-06-16 19:47:48 -07:00
cb710: more cleanup for the DEBUG case.
2009-06-13 22:42:59 +02:00
fs: Remove i_cindex from struct inode
2009-06-11 21:36:09 -04:00
[ARM] 5536/1: Move clk_add_alias() to arch/arm/common/clkdev.c
2009-06-04 17:45:43 +01:00
timers: Logic to move non pinned timers
2009-05-13 16:52:42 +02:00
clocksource: setup mult_orig in clocksource_enable()
2009-05-02 11:45:15 +02:00
signals: implement sys_rt_tgsigqueueinfo
2009-04-30 19:24:24 +02:00
module_param: add __same_type convenience wrapper for __builtin_types_compatible_p
2009-06-12 21:46:57 +09:30
cpumask: introduce zalloc_cpumask_var
2009-06-09 22:30:26 +09:30
cpuset,mm: update tasks' mems_allowed in time
2009-06-16 19:47:31 -07:00
linux/magic.h: move cramfs magic out of cramfs_fs.h
2009-06-11 21:36:10 -04:00
cred: #include init.h in cred.h
2009-05-29 08:40:01 -07:00
tty: cyclades, remove typedefs
2009-06-11 08:50:57 -07:00
dcache: extrace and use d_unlinked()
2009-06-11 21:36:06 -04:00
block: Do away with the notion of hardsect_size
2009-05-22 23:22:54 +02:00
PM: Remove device_type suspend()/resume()
2009-06-12 21:32:32 +02:00
dlm: Make name input parameter of {,dlm_}new_lockspace() const
2009-05-07 10:14:26 -05:00
ioatdma: fix "ioatdma frees DMA memory with wrong function"
2009-05-12 14:41:47 -07:00
x86: x2apic, IR: Clean up X86_X2APIC and INTR_REMAP config checks
2009-04-21 09:08:25 +02:00
dnotify: reimplement dnotify using fsnotify
2009-06-11 14:57:53 -04:00
block: implement and enforce request peek/start/fetch
2009-05-11 09:52:18 +02:00
net: introduce a list of device addresses dev_addr_list (v6)
2009-05-05 12:26:24 -07:00
e1000e: Expose MDI-X status via ethtool change
2009-06-09 05:25:36 -07:00
fbdev: add support for handoff from firmware to hw framebuffers
2009-06-16 19:48:00 -07:00
firmware_map: fix hang with x86/32bit
2009-06-16 19:47:28 -07:00
mm: remove __invalidate_mapping_pages variant
2009-06-16 19:47:43 -07:00
net: Rework fs_enet driver to use of_mdio infrastructure
2009-04-27 02:53:51 -07:00
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
2009-04-22 13:02:09 +10:00
fsnotify: move events should indicate the event was on a child
2009-06-11 14:57:54 -04:00
inotify: reimplement inotify using fsnotify
2009-06-11 14:57:54 -04:00
tracing: make trace pipe recognize latency format flag
2009-06-01 23:26:02 -04:00
CUSE: implement CUSE - Character device in Userspace
2009-06-09 11:24:11 +02:00
futex: remove FUTEX_REQUEUE_PI (non CMP)
2009-04-30 11:41:35 +02:00
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
2009-06-12 09:29:42 -07:00
page-allocator: use integer fields lookup for gfp_zone and check for errors in flags passed to the page allocator
2009-06-16 19:47:41 -07:00
HID: add new multitouch and digitizer contants
2009-05-20 15:48:35 +02:00
mm: check the argument of kunmap on architectures without highmem
2009-06-16 19:47:41 -07:00
clocksource: prevent selection of low resolution clocksourse also for nohz=on
2009-06-13 12:00:26 +02:00
mm: introduce PageHuge() for testing huge/gigantic pages
2009-06-16 19:47:36 -07:00
i2c-ocores: Can add I2C devices to the bus
2009-06-13 10:39:28 +01:00
i7300_idle: allow testing on i5000-series hardware w/o re-compile
2009-05-28 20:52:40 -04:00
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
2009-06-11 10:00:03 -07:00
cfg80211: use key size constants
2009-06-03 14:05:10 -04:00
net: release dst entry in dev_hard_start_xmit()
2009-05-18 22:19:19 -07:00
Add constants for the ieee 802.15.4 stack
2009-06-09 05:25:30 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
af_packet: Teach to listen for multiple unicast addresses.
2009-05-21 15:13:39 -07:00
tun: add IFF_TUN_EXCL flag to avoid opening a persistent device.
2009-04-27 03:23:54 -07:00
sit: stateless autoconf for isatap
2009-05-19 16:02:02 -07:00
integrity: path_check update
2009-05-22 09:43:41 +10:00
ipv4: New multicast-all socket option
2009-06-02 00:45:24 -07:00
fbdev: move logo externs to header file
2009-06-16 19:47:57 -07:00
mm: consolidate init_mm definition
2009-06-16 19:47:28 -07:00
Input: multitouch - add tracking ID to the protocol
2009-05-23 09:53:18 -07:00
PM: Add empty suspend/resume device irq functions
2009-06-12 21:32:33 +02:00
block: prevent possible io_context->refcount overflow
2009-06-10 23:07:15 +02:00
ipmi: add oem message handling
2009-04-21 13:41:48 -07:00
ipmi: add oem message handling
2009-04-21 13:41:48 -07:00
IPv6: Add 'autoconf' and 'disable_ipv6' module parameters
2009-06-01 03:07:33 -07:00
x86: remove some alloc_bootmem_cpumask_var calling
2009-06-11 19:27:07 +03:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
perfcounters, sched: remove __task_delta_exec()
2009-04-20 20:38:21 +02:00
keyboard: advertise KT_DEAD2 extended diacriticals
2009-06-14 13:50:36 -07:00
kmemleak: Add the base support
2009-06-11 17:03:28 +01:00
KVM: Make kvm header C++ friendly
2009-06-10 11:48:39 +03:00
KVM: protect assigned dev workqueue, int handler and irq acker
2009-06-10 11:48:53 +03:00
KVM: APIC: get rid of deliver_bitmask
2009-06-10 11:48:27 +03:00
lguest: improve interrupt handling, speed up stream networking
2009-06-12 22:27:03 +09:30
lguest: remove obsolete LHREQ_BREAK call
2009-06-12 22:27:11 +09:30
fbdev: move logo externs to header file
2009-06-16 19:47:57 -07:00
lis3: add click function
2009-06-16 19:47:57 -07:00
list_nulls: add hlist_nulls_add_head and hlist_nulls_del
2009-06-13 12:28:57 +02:00
loop: use BIO list management functions
2009-04-28 07:37:28 +02:00
linux/magic.h: move cramfs magic out of cramfs_fs.h
2009-06-11 21:36:10 -04:00
drbd: add major number to major.h
2009-06-16 19:47:48 -07:00
mdio: Expose 10GBASE-T MDI-X status via ethtool
2009-06-11 02:47:10 -07:00
vmscan: evict use-once pages first
2009-06-16 19:47:38 -07:00
mii: Add mii_advertise_flowctrl()
2009-04-29 17:32:35 -07:00
mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti
2009-05-25 00:55:30 -07:00
mISDN: cleanup mISDNhw.h
2009-06-11 19:05:32 +02:00
mISDN: Cleanup debug messages
2009-05-25 00:55:45 -07:00
mm cleanup: shmem_file_setup: 'char *' -> 'const char *' for name argument
2009-06-16 19:47:44 -07:00
oom: move oom_adj value from task_struct to mm_struct
2009-06-16 19:47:43 -07:00
mm: fix Committed_AS underflow on large NR_CPUS environment
2009-05-02 15:36:10 -07:00
tracing: x86, mmiotrace: only register for die notifier when tracer active
2009-04-29 11:33:34 +02:00
mm: remove CONFIG_UNEVICTABLE_LRU config option
2009-06-16 19:47:42 -07:00
headers: move module_bug_finalize()/module_bug_cleanup() definitions into module.h
2009-06-16 19:47:48 -07:00
module_param: allow 'bool' module_params to be bool, not just int.
2009-06-12 21:46:58 +09:30
fs: introduce mnt_clone_write
2009-06-11 21:36:02 -04:00
mutex: add atomic_dec_and_mutex_lock(), fix
2009-04-30 09:01:34 +02:00
switch follow_down()
2009-06-11 21:36:01 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
netdevice.h: Use frag list abstraction interfaces.
2009-06-09 00:17:27 -07:00
nl80211: Add RSC configuration for new keys
2009-05-13 15:44:39 -04:00
net: add NL802154 interface for configuration of 802.15.4 devices
2009-06-09 05:25:33 -07:00
nls: add a nls_nullsize inline
2009-04-30 15:32:11 +00:00
page allocator: use a pre-calculated value instead of num_online_nodes() in fast paths
2009-06-16 19:47:35 -07:00
net: introduce pre-up netdev notifier
2009-06-03 14:05:12 -04:00
of: add of_parse_phandle() helper for parsing phandle properties
2009-04-27 02:53:45 -07:00
openfirmware: Add OF phylib support code
2009-04-27 02:53:47 -07:00
of: make of_(un)register_platform_driver common code
2009-05-02 15:36:10 -07:00
mm: remove CONFIG_UNEVICTABLE_LRU config option
2009-06-16 19:47:42 -07:00
memcg: fix page_cgroup fatal error in FLATMEM
2009-06-12 11:00:54 +03:00
mm: remove CONFIG_UNEVICTABLE_LRU config option
2009-06-16 19:47:42 -07:00
parport: quickfix the proc registration bug
2009-06-02 09:53:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-06-15 09:40:05 -07:00
PCI: only save/restore existent registers in the PCIe capability
2009-04-22 15:59:41 -07:00
PERCPU: Collect the DECLARE/DEFINE declarations together
2009-04-21 19:40:00 -07:00
kmemleak: Remove some of the kmemleak false positives
2009-06-11 17:04:18 +01:00
perf_counter: Add forward/backward attribute ABI compatibility
2009-06-12 14:28:52 +02:00
phy: Eliminate references to BUS_ID_SIZE.
2009-05-26 21:16:25 -07:00
splice: implement default splice_read method
2009-05-11 14:13:10 +02:00
pktcdvd.h should include mempool.h
2009-04-24 08:54:21 +02:00
Revert driver core: move platform_data into platform_device
2009-05-08 19:22:21 -07:00
PM core: rename suspend and resume functions
2009-06-12 21:32:31 +02:00
pnp: add PNP resource range checking function
2009-06-05 14:37:41 +00:00
poll: avoid extra wakeups in select/poll
2009-06-16 19:47:48 -07:00
Move junk from proc_fs.h to fs/proc/internal.h
2009-06-11 21:36:01 -04:00
fs/qnx4: sanitize includes
2009-06-11 21:36:12 -04:00
quota: Introduce writeout_quota_sb() (version 4)
2009-06-11 21:36:04 -04:00
radix-tree: add radix_tree_prev_hole()
2009-06-16 19:47:30 -07:00
lib: isolate rational fractions helper function
2009-06-11 08:51:08 -07:00
reiserfs: allow exposing privroot w/ xattrs enabled
2009-06-11 21:35:58 -04:00
reiserfs: fixup perms when xattrs are disabled
2009-05-17 11:45:45 -07:00
rfkill: don't impose global states on resume (just restore the previous states)
2009-06-10 13:28:37 -04:00
ring-buffer: pass in lockdep class key for reader_lock
2009-06-08 18:50:20 -04:00
vmscan: report vm_flags in page_referenced()
2009-06-16 19:47:44 -07:00
romfs: cleanup romfs_fs.h
2009-05-09 10:49:41 -04:00
oom: move oom_adj value from task_struct to mm_struct
2009-06-16 19:47:43 -07:00
sctp: fix error cause codes of ADD-IP extension
2009-06-03 09:14:45 -04:00
security: use mmap_min_addr indepedently of security models
2009-06-04 12:07:48 +10:00
serial: refactor ASYNC_ flags
2009-06-11 08:50:58 -07:00
serial: Added Timberdale UART driver
2009-06-11 08:51:06 -07:00
sh-sci: improve clock framework support
2009-05-08 23:22:26 +09:00
sh: Consolidate MTU2/CMT/TMU timer platform data.
2009-05-03 17:57:17 +09:00
signals: implement sys_rt_tgsigqueueinfo
2009-04-30 19:24:24 +02:00
mac80211: do not pass PS frames out of mac80211 again
2009-06-10 13:28:37 -04:00
slab,slub: don't enable interrupts during early boot
2009-06-12 18:53:33 +03:00
slab,slub: don't enable interrupts during early boot
2009-06-12 18:53:33 +03:00
Trivial: fix a typo in slow-work.h
2009-04-21 19:40:00 -07:00
slab,slub: don't enable interrupts during early boot
2009-06-12 18:53:33 +03:00
remove put_cpu_no_resched()
2009-06-16 19:47:48 -07:00
smsc911x: add fifo byteswap support V2
2009-04-28 01:53:11 -07:00
snmp: add missing counters for RFC 4293
2009-04-27 02:45:02 -07:00
Add constants for the ieee 802.15.4 stack
2009-06-09 05:25:30 -07:00
spinlock: Add missing __raw_spin_lock_flags() stub for UP
2009-06-10 11:48:14 +02:00
splice: fix misleading comment
2009-05-12 11:11:48 +02:00
PM/Hibernate: Move NVS routines into a seperate file (v2).
2009-06-12 21:32:33 +02:00
mm: remove file argument from swap_readpage()
2009-06-16 19:47:44 -07:00
syscalls.h: remove duplicated declarations for sys_pipe2
2009-06-16 19:47:52 -07:00
syncookies: remove last_synq_overflow from struct tcp_sock
2009-04-20 02:25:26 -07:00
clocksource: prevent selection of low resolution clocksourse also for nohz=on
2009-06-13 12:00:26 +02:00
timekeeping: create arch_gettimeoffset infrastructure
2009-05-02 11:45:15 +02:00
timers: Framework for identifying pinned timers
2009-05-13 16:52:42 +02:00
time: move PIT_TICK_RATE to linux/timex.h
2009-06-16 19:47:27 -07:00
tracing: add trace_seq_vprint interface
2009-06-09 15:17:32 -04:00
ptrace: tracehook_report_clone: fix false positives
2009-06-04 18:07:40 -07:00
tracing: remove deprecated TRACE_FORMAT
2009-04-24 11:50:39 -04:00
tty: rewrite the ldisc locking
2009-06-11 08:51:01 -07:00
tty: throttling race fix
2009-06-11 08:50:59 -07:00
Trivial: fix typo s/balence/balance/
2009-06-12 18:01:45 +02:00
utsname.h: make new_utsname fields use the proper length constant
2009-06-16 19:47:47 -07:00
virtio: add names to virtqueue struct, mapping from devices to queues.
2009-06-12 22:16:36 +09:30
Add serial number support for virtio_blk, V4a
2009-06-09 14:41:40 +02:00
virtio: teach virtio_has_feature() about transport features
2009-06-12 22:16:38 +09:30
virtio: add missing include to virtio_net.h
2009-05-01 15:34:02 -07:00
virtio_pci: optional MSI-X support
2009-06-12 22:16:37 +09:30
virtio: indirect ring entries (VIRTIO_RING_F_INDIRECT_DESC)
2009-06-12 22:16:39 +09:30
drivers: add support for the TI VLYNQ bus
2009-06-16 19:47:52 -07:00
vmscan: count the number of times zone_reclaim() scans and fails
2009-06-16 19:47:46 -07:00
Merge commit 'v2.6.30-rc5' into sched/core
2009-05-11 12:59:37 +02:00
wimax: a new API call was added, increment minor protocol version number
2009-05-28 18:02:32 -07:00
vfs: Make sys_sync() use fsync_super() (version 4)
2009-06-11 21:36:03 -04:00
