rpms/kernel/devel increase-MAX_LOCKDEP_ENTRIES.patch, NONE, 1.1.2.2 linux-2.6-btrfs-experimental-branch.patch, NONE, 1.1.2.2 linux-2.6-ext4-print-warning-once.patch, NONE, 1.1.2.2 linux-2.6-net-velocity-dma.patch, NONE, 1.1.2.2 linux-2.6-v4l-dvb-experimental.patch, NONE, 1.2.2.2 patch-2.6.29-rc8-git2.bz2.sign, NONE, 1.1.2.2 patch-2.6.29-rc8.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.6, 1.1014.2.7 config-generic, 1.238.6.9, 1.238.6.10 drm-modesetting-radeon.patch, 1.54.6.5, 1.54.6.6 drm-next.patch, 1.6.6.3, 1.6.6.4 drm-nouveau.patch, 1.8.6.3, 1.8.6.4 kernel.spec, 1.1294.2.11, 1.1294.2.12 linux-2.6-v4l-dvb-fixes.patch, 1.2.8.3, 1.2.8.4 linux-2.6-v4l-dvb-update.patch, 1.1.2.5, 1.1.2.6 sources, 1.976.2.7, 1.976.2.8 upstream, 1.888.2.6, 1.888.2.7 xen.pvops.patch, 1.1.2.10, 1.1.2.11 xen.pvops.post.patch, 1.1.2.4, 1.1.2.5 xen.pvops.pre.patch, 1.1.2.4, 1.1.2.5 linux-2.6-hdpvr-fix.patch, 1.1.2.2, NONE patch-2.6.29-rc7-git5.bz2.sign, 1.1.2.2, NONE patch-2.6.29-rc7.bz2.sign, 1.1.6.2, NONE squashfs-fix-page-aligned-data.patch, 1.2.2.2, NONE unifdef-rename-getline-symbol.patch, 1.1.2.2, NONE
Michael Young
myoung at fedoraproject.org
Tue Mar 17 21:36:11 UTC 2009
- Previous message (by thread): rpms/cvsweb/devel cvsweb.spec,1.14,1.15
- Next message (by thread): rpms/epiphany/devel epiphany.spec, 1.223, 1.224 build-fix.patch, 1.1, NONE build-fixes.patch, 1.1, NONE epiphany-2.25-moz191.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: myoung
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32161
Modified Files:
Tag: private-myoung-dom0-branch
.cvsignore config-generic drm-modesetting-radeon.patch
drm-next.patch drm-nouveau.patch kernel.spec
linux-2.6-v4l-dvb-fixes.patch linux-2.6-v4l-dvb-update.patch
sources upstream xen.pvops.patch xen.pvops.post.patch
xen.pvops.pre.patch
Added Files:
Tag: private-myoung-dom0-branch
increase-MAX_LOCKDEP_ENTRIES.patch
linux-2.6-btrfs-experimental-branch.patch
linux-2.6-ext4-print-warning-once.patch
linux-2.6-net-velocity-dma.patch
linux-2.6-v4l-dvb-experimental.patch
patch-2.6.29-rc8-git2.bz2.sign patch-2.6.29-rc8.bz2.sign
Removed Files:
Tag: private-myoung-dom0-branch
linux-2.6-hdpvr-fix.patch patch-2.6.29-rc7-git5.bz2.sign
patch-2.6.29-rc7.bz2.sign squashfs-fix-page-aligned-data.patch
unifdef-rename-getline-symbol.patch
Log Message:
Another pvops update
increase-MAX_LOCKDEP_ENTRIES.patch:
--- NEW FILE increase-MAX_LOCKDEP_ENTRIES.patch ---
diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
index 56b1969..58258a5 100644
--- a/kernel/lockdep_internals.h
+++ b/kernel/lockdep_internals.h
@@ -15,7 +15,7 @@
* table (if it's not there yet), and we check it for lock order
* conflicts and deadlocks.
*/
-#define MAX_LOCKDEP_ENTRIES 8192UL
+#define MAX_LOCKDEP_ENTRIES 10240UL
#define MAX_LOCKDEP_CHAINS_BITS 14
#define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS)
linux-2.6-btrfs-experimental-branch.patch:
--- NEW FILE linux-2.6-btrfs-experimental-branch.patch ---
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index d2cf5a5..9adf5e4 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -8,7 +8,7 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \
- compression.o
+ compression.o delayed-ref.o
else
# Normal Makefile
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 37f31b5..dbb7241 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -254,18 +254,13 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
* empty_size -- a hint that you plan on doing more cow. This is the size in
* bytes the allocator should try to find free next to the block it returns.
* This is just a hint and may be ignored by the allocator.
- *
- * prealloc_dest -- if you have already reserved a destination for the cow,
- * this uses that block instead of allocating a new one.
- * btrfs_alloc_reserved_extent is used to finish the allocation.
*/
static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct extent_buffer *buf,
struct extent_buffer *parent, int parent_slot,
struct extent_buffer **cow_ret,
- u64 search_start, u64 empty_size,
- u64 prealloc_dest)
+ u64 search_start, u64 empty_size)
{
u64 parent_start;
struct extent_buffer *cow;
@@ -291,26 +286,10 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
level = btrfs_header_level(buf);
nritems = btrfs_header_nritems(buf);
- if (prealloc_dest) {
- struct btrfs_key ins;
-
- ins.objectid = prealloc_dest;
- ins.offset = buf->len;
- ins.type = BTRFS_EXTENT_ITEM_KEY;
-
- ret = btrfs_alloc_reserved_extent(trans, root, parent_start,
- root->root_key.objectid,
- trans->transid, level, &ins);
- BUG_ON(ret);
- cow = btrfs_init_new_buffer(trans, root, prealloc_dest,
- buf->len, level);
- } else {
- cow = btrfs_alloc_free_block(trans, root, buf->len,
- parent_start,
- root->root_key.objectid,
- trans->transid, level,
- search_start, empty_size);
- }
+ cow = btrfs_alloc_free_block(trans, root, buf->len,
+ parent_start, root->root_key.objectid,
+ trans->transid, level,
+ search_start, empty_size);
if (IS_ERR(cow))
return PTR_ERR(cow);
@@ -413,7 +392,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct extent_buffer *buf,
struct extent_buffer *parent, int parent_slot,
- struct extent_buffer **cow_ret, u64 prealloc_dest)
+ struct extent_buffer **cow_ret)
{
u64 search_start;
int ret;
@@ -436,7 +415,6 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
btrfs_header_owner(buf) == root->root_key.objectid &&
!btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) {
*cow_ret = buf;
- WARN_ON(prealloc_dest);
return 0;
}
@@ -447,8 +425,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
btrfs_set_lock_blocking(buf);
ret = __btrfs_cow_block(trans, root, buf, parent,
- parent_slot, cow_ret, search_start, 0,
- prealloc_dest);
+ parent_slot, cow_ret, search_start, 0);
return ret;
}
@@ -617,7 +594,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
err = __btrfs_cow_block(trans, root, cur, parent, i,
&cur, search_start,
min(16 * blocksize,
- (end_slot - i) * blocksize), 0);
+ (end_slot - i) * blocksize));
if (err) {
btrfs_tree_unlock(cur);
free_extent_buffer(cur);
@@ -937,7 +914,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
BUG_ON(!child);
btrfs_tree_lock(child);
btrfs_set_lock_blocking(child);
- ret = btrfs_cow_block(trans, root, child, mid, 0, &child, 0);
+ ret = btrfs_cow_block(trans, root, child, mid, 0, &child);
BUG_ON(ret);
spin_lock(&root->node_lock);
@@ -945,6 +922,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
spin_unlock(&root->node_lock);
ret = btrfs_update_extent_ref(trans, root, child->start,
+ child->len,
mid->start, child->start,
root->root_key.objectid,
trans->transid, level - 1);
@@ -971,6 +949,10 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
BTRFS_NODEPTRS_PER_BLOCK(root) / 4)
return 0;
+ if (trans->transaction->delayed_refs.flushing &&
+ btrfs_header_nritems(mid) > 2)
+ return 0;
+
if (btrfs_header_nritems(mid) < 2)
err_on_enospc = 1;
@@ -979,7 +961,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
btrfs_tree_lock(left);
btrfs_set_lock_blocking(left);
wret = btrfs_cow_block(trans, root, left,
- parent, pslot - 1, &left, 0);
+ parent, pslot - 1, &left);
if (wret) {
ret = wret;
goto enospc;
@@ -990,7 +972,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
btrfs_tree_lock(right);
btrfs_set_lock_blocking(right);
wret = btrfs_cow_block(trans, root, right,
- parent, pslot + 1, &right, 0);
+ parent, pslot + 1, &right);
if (wret) {
ret = wret;
goto enospc;
@@ -1171,7 +1153,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
wret = 1;
} else {
ret = btrfs_cow_block(trans, root, left, parent,
- pslot - 1, &left, 0);
+ pslot - 1, &left);
if (ret)
wret = 1;
else {
@@ -1222,7 +1204,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
} else {
ret = btrfs_cow_block(trans, root, right,
parent, pslot + 1,
- &right, 0);
+ &right);
if (ret)
wret = 1;
else {
@@ -1492,7 +1474,6 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
u8 lowest_level = 0;
u64 blocknr;
u64 gen;
- struct btrfs_key prealloc_block;
lowest_level = p->lowest_level;
WARN_ON(lowest_level && ins_len > 0);
@@ -1501,8 +1482,6 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
if (ins_len < 0)
lowest_unlock = 2;
- prealloc_block.objectid = 0;
-
again:
if (p->skip_locking)
b = btrfs_root_node(root);
@@ -1529,44 +1508,11 @@ again:
!btrfs_header_flag(b, BTRFS_HEADER_FLAG_WRITTEN)) {
goto cow_done;
}
-
- /* ok, we have to cow, is our old prealloc the right
- * size?
- */
- if (prealloc_block.objectid &&
- prealloc_block.offset != b->len) {
- btrfs_release_path(root, p);
- btrfs_free_reserved_extent(root,
- prealloc_block.objectid,
- prealloc_block.offset);
[...4808 lines suppressed...]
+ while (info->running_transaction &&
+ info->running_transaction->delayed_refs.flushing) {
+ prepare_to_wait(&info->transaction_wait, &wait,
+ TASK_UNINTERRUPTIBLE);
+ mutex_unlock(&info->trans_mutex);
+ schedule();
+ mutex_lock(&info->trans_mutex);
+ finish_wait(&info->transaction_wait, &wait);
+ }
+ mutex_unlock(&info->trans_mutex);
+ return 0;
+}
+
+/*
* Given a list of roots that need to be deleted, call btrfs_drop_snapshot on
* all of them
*/
@@ -661,7 +724,22 @@ static noinline int drop_dirty_roots(struct btrfs_root *tree_root,
atomic_inc(&root->fs_info->throttles);
while (1) {
+ /*
+ * we don't want to jump in and create a bunch of
+ * delayed refs if the transaction is starting to close
+ */
+ wait_transaction_pre_flush(tree_root->fs_info);
trans = btrfs_start_transaction(tree_root, 1);
+
+ /*
+ * we've joined a transaction, make sure it isn't
+ * closing right now
+ */
+ if (trans->transaction->delayed_refs.flushing) {
+ btrfs_end_transaction(trans, tree_root);
+ continue;
+ }
+
mutex_lock(&root->fs_info->drop_mutex);
ret = btrfs_drop_snapshot(trans, dirty->root);
if (ret != -EAGAIN)
@@ -766,7 +844,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY);
old = btrfs_lock_root_node(root);
- btrfs_cow_block(trans, root, old, NULL, 0, &old, 0);
+ btrfs_cow_block(trans, root, old, NULL, 0, &old);
btrfs_copy_root(trans, root, old, &tmp, objectid);
btrfs_tree_unlock(old);
@@ -894,12 +972,29 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
struct extent_io_tree *pinned_copy;
DEFINE_WAIT(wait);
int ret;
+ int should_grow = 0;
+ unsigned long now = get_seconds();
+
+ /* make a pass through all the delayed refs we have so far
+ * any runnings procs may add more while we are here
+ */
+ ret = btrfs_run_delayed_refs(trans, root, 0);
+ BUG_ON(ret);
+
+ cur_trans = trans->transaction;
+ /*
+ * set the flushing flag so procs in this transaction have to
+ * start sending their work down.
+ */
+ cur_trans->delayed_refs.flushing = 1;
+
+ ret = btrfs_run_delayed_refs(trans, root, 0);
+ BUG_ON(ret);
- INIT_LIST_HEAD(&dirty_fs_roots);
mutex_lock(&root->fs_info->trans_mutex);
- if (trans->transaction->in_commit) {
- cur_trans = trans->transaction;
- trans->transaction->use_count++;
+ INIT_LIST_HEAD(&dirty_fs_roots);
+ if (cur_trans->in_commit) {
+ cur_trans->use_count++;
mutex_unlock(&root->fs_info->trans_mutex);
btrfs_end_transaction(trans, root);
@@ -922,7 +1017,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
trans->transaction->in_commit = 1;
trans->transaction->blocked = 1;
- cur_trans = trans->transaction;
if (cur_trans->list.prev != &root->fs_info->trans_list) {
prev_trans = list_entry(cur_trans->list.prev,
struct btrfs_transaction, list);
@@ -937,6 +1031,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
}
}
+ if (now < cur_trans->start_time || now - cur_trans->start_time < 1)
+ should_grow = 1;
+
do {
int snap_pending = 0;
joined = cur_trans->num_joined;
@@ -949,7 +1046,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
if (cur_trans->num_writers > 1)
timeout = MAX_SCHEDULE_TIMEOUT;
- else
+ else if (should_grow)
timeout = 1;
mutex_unlock(&root->fs_info->trans_mutex);
@@ -959,16 +1056,21 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
BUG_ON(ret);
}
- schedule_timeout(timeout);
+ smp_mb();
+ if (cur_trans->num_writers > 1 || should_grow)
+ schedule_timeout(timeout);
mutex_lock(&root->fs_info->trans_mutex);
finish_wait(&cur_trans->writer_wait, &wait);
} while (cur_trans->num_writers > 1 ||
- (cur_trans->num_joined != joined));
+ (should_grow && cur_trans->num_joined != joined));
ret = create_pending_snapshots(trans, root->fs_info);
BUG_ON(ret);
+ ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
+ BUG_ON(ret);
+
WARN_ON(cur_trans != trans->transaction);
/* btrfs_commit_tree_roots is responsible for getting the
@@ -1032,6 +1134,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
btrfs_copy_pinned(root, pinned_copy);
trans->transaction->blocked = 0;
+
wake_up(&root->fs_info->transaction_throttle);
wake_up(&root->fs_info->transaction_wait);
@@ -1058,6 +1161,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
mutex_lock(&root->fs_info->trans_mutex);
cur_trans->commit_done = 1;
+
root->fs_info->last_trans_committed = cur_trans->transid;
wake_up(&cur_trans->commit_wait);
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index ea29211..94f5bde 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -19,10 +19,16 @@
#ifndef __BTRFS_TRANSACTION__
#define __BTRFS_TRANSACTION__
#include "btrfs_inode.h"
+#include "delayed-ref.h"
struct btrfs_transaction {
u64 transid;
+ /*
+ * total writers in this transaction, it must be zero before the
+ * transaction can end
+ */
unsigned long num_writers;
+
unsigned long num_joined;
int in_commit;
int use_count;
@@ -34,6 +40,7 @@ struct btrfs_transaction {
wait_queue_head_t writer_wait;
wait_queue_head_t commit_wait;
struct list_head pending_snapshots;
+ struct btrfs_delayed_ref_root delayed_refs;
};
struct btrfs_trans_handle {
@@ -44,6 +51,7 @@ struct btrfs_trans_handle {
u64 block_group;
u64 alloc_exclude_start;
u64 alloc_exclude_nr;
+ unsigned long delayed_ref_updates;
};
struct btrfs_pending_snapshot {
diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c
index 98d25fa..b10eacd 100644
--- a/fs/btrfs/tree-defrag.c
+++ b/fs/btrfs/tree-defrag.c
@@ -124,8 +124,6 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
}
btrfs_release_path(root, path);
- if (is_extent)
- btrfs_extent_post_op(trans, root);
out:
if (path)
btrfs_free_path(path);
linux-2.6-ext4-print-warning-once.patch:
--- NEW FILE linux-2.6-ext4-print-warning-once.patch ---
From: Theodore Ts'o <tytso at mit.edu>
Date: Thu, 12 Mar 2009 16:20:01 +0000 (-0400)
Subject: ext4: Print the find_group_flex() warning only once
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftytso%2Fext4.git;a=commitdiff_plain;h=e8eb6f8319eb2536d292fc18fe14e745c970049a
ext4: Print the find_group_flex() warning only once
This is a short-term warning, and even printk_ratelimit() can result
in too much noise in system logs. So only print it once as a warning.
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 627f8c3..2d2b358 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -698,6 +698,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode)
struct inode *ret;
ext4_group_t i;
int free = 0;
+ static int once = 1;
ext4_group_t flex_group;
/* Cannot create files in a deleted directory */
@@ -719,7 +720,8 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode)
ret2 = find_group_flex(sb, dir, &group);
if (ret2 == -1) {
ret2 = find_group_other(sb, dir, &group);
- if (ret2 == 0 && printk_ratelimit())
+ if (ret2 == 0 && once)
+ once = 0;
printk(KERN_NOTICE "ext4: find_group_flex "
"failed, fallback succeeded dir %lu\n",
dir->i_ino);
linux-2.6-net-velocity-dma.patch:
--- NEW FILE linux-2.6-net-velocity-dma.patch ---
The DMA debug patches caught this..
via-velocity 0000:00:0e.0: DMA-API: device driver frees DMA memory with different size [device address=0x000000001a4c8ca2] [map size=60 bytes] [unmap size=54 bytes]
Signed-off-by: Dave Jones <davej at redhat.com>
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index c5691fd..cd34dda 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1838,6 +1838,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_
{
struct sk_buff *skb = tdinfo->skb;
int i;
+ int pktlen;
/*
* Don't unmap the pre-allocated tx_bufs
@@ -1845,10 +1846,12 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_
if (tdinfo->skb_dma) {
for (i = 0; i < tdinfo->nskb_dma; i++) {
+ pktlen = max_t(unsigned, skb->len, ETH_ZLEN);
+
#ifdef VELOCITY_ZERO_COPY_SUPPORT
pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE);
#else
- pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], skb->len, PCI_DMA_TODEVICE);
+ pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], pktlen, PCI_DMA_TODEVICE);
#endif
tdinfo->skb_dma[i] = 0;
}
@@ -2080,17 +2083,14 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
struct tx_desc *td_ptr;
struct velocity_td_info *tdinfo;
unsigned long flags;
- int pktlen = skb->len;
+ int pktlen;
__le16 len;
int index;
-
- if (skb->len < ETH_ZLEN) {
- if (skb_padto(skb, ETH_ZLEN))
- goto out;
- pktlen = ETH_ZLEN;
- }
+ if (skb_padto(skb, ETH_ZLEN))
+ goto out;
+ pktlen = max_t(unsigned, skb->len, ETH_ZLEN);
len = cpu_to_le16(pktlen);
linux-2.6-v4l-dvb-experimental.patch:
--- NEW FILE linux-2.6-v4l-dvb-experimental.patch ---
Mauro Carvalho Chehab (6):
V4L/DVB (10953): cx25840: Fix CodingStyle errors introduced by the last patch
V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent
V4L/DVB (10956): cx231xx: First series of manual CodingStyle fixes
V4L/DVB (10957a): cx231xx: Fix compilation breakage
V4L/DVB (10958a): cx231xx: Whitespace and Kconfig fixes
Merge branch 'next' of ../pending into Fedora
Sri Deevi (4):
V4L/DVB (10952): cx25840: prepare it to be used by cx231xx module
V4L/DVB (10954): Add cx231xx USB driver
V4L/DVB (10957): cx231xx: Fix CodingStyle
V4L/DVB (10958): Some additional CodingStyle and minor fixes
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3f85b9e..114bf04 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -793,6 +793,8 @@ source "drivers/media/video/hdpvr/Kconfig"
source "drivers/media/video/em28xx/Kconfig"
+source "drivers/media/video/cx231xx/Kconfig"
+
source "drivers/media/video/usbvision/Kconfig"
source "drivers/media/video/usbvideo/Kconfig"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 02379f5..9e40396 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o
obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
+obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o
obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
new file mode 100644
index 0000000..aba05d3
--- /dev/null
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -0,0 +1,35 @@
+config VIDEO_CX231XX
+ tristate "Conexant cx231xx USB video capture support"
+ depends on VIDEO_DEV && I2C && INPUT
+ select VIDEO_TUNER
+ select VIDEO_TVEEPROM
+ select VIDEO_IR
+ select VIDEOBUF_VMALLOC
+ select VIDEO_CX25840
+
+ ---help---
+ This is a video4linux driver for Conexant 231xx USB based TV cards.
+
+ To compile this driver as a module, choose M here: the
+ module will be called cx231xx
+
+config VIDEO_CX231XX_ALSA
+ tristate "Conexant Cx231xx ALSA audio module"
+ depends on VIDEO_CX231XX && SND
+ select SND_PCM
+
+ ---help---
+ This is an ALSA driver for Cx231xx USB based TV cards.
+
+ To compile this driver as a module, choose M here: the
+ module will be called cx231xx-alsa
+
+config VIDEO_CX231XX_DVB
+ tristate "DVB/ATSC Support for Cx231xx based TV cards"
+ depends on VIDEO_CX231XX && DVB_CORE
+ select VIDEOBUF_DVB
+ select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+
+ ---help---
+ This adds support for DVB cards based on the
+ Conexant cx231xx chips.
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
new file mode 100644
index 0000000..1dad936
--- /dev/null
+++ b/drivers/media/video/cx231xx/Makefile
@@ -0,0 +1,12 @@
+cx231xx-objs := cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o \
+ cx231xx-avcore.o cx231xx-pcb-cfg.o cx231xx-vbi.o
+
+obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o
+obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-audio.o
+obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
+
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/common/tuners
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+
diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c
new file mode 100644
index 0000000..0027b90
--- /dev/null
+++ b/drivers/media/video/cx231xx/cx231xx-audio.c
@@ -0,0 +1,585 @@
+/*
+ * Conexant Cx231xx audio extension
+ *
+ * Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
+ * Based on em28xx driver
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/usb.h>
+#include <linux/init.h>
+#include <linux/sound.h>
+#include <linux/spinlock.h>
+#include <linux/soundcard.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/proc_fs.h>
+#include <linux/module.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/info.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <media/v4l2-common.h>
+#include "cx231xx.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "activates debug info");
+
+#define dprintk(fmt, arg...) do { \
+ if (debug) \
+ printk(KERN_INFO "cx231xx-audio %s: " fmt, \
+ __func__, ##arg); \
+ } while (0)
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+
+static int cx231xx_isoc_audio_deinit(struct cx231xx *dev)
+{
+ int i;
+
+ dprintk("Stopping isoc\n");
+
+ for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
+ if (dev->adev.urb[i]) {
+ if (!irqs_disabled())
+ usb_kill_urb(dev->adev.urb[i]);
+ else
+ usb_unlink_urb(dev->adev.urb[i]);
+
+ usb_free_urb(dev->adev.urb[i]);
+ dev->adev.urb[i] = NULL;
+
+ kfree(dev->adev.transfer_buffer[i]);
+ dev->adev.transfer_buffer[i] = NULL;
+ }
+ }
+
+ return 0;
+}
+
+static void cx231xx_audio_isocirq(struct urb *urb)
+{
+ struct cx231xx *dev = urb->context;
+ int i;
+ unsigned int oldptr;
+ int period_elapsed = 0;
+ int status;
+ unsigned char *cp;
+ unsigned int stride;
+ struct snd_pcm_substream *substream;
+ struct snd_pcm_runtime *runtime;
+
+ switch (urb->status) {
+ case 0: /* success */
+ case -ETIMEDOUT: /* NAK */
+ break;
+ case -ECONNRESET: /* kill */
+ case -ENOENT:
[...14230 lines suppressed...]
- "vblank %i, vactive %i, vblank656 %i, src_dec %i, "
- "burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x, "
- "sc 0x%06x\n",
- hblank, hactive, vblank, vactive, vblank656,
- src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
+ "PLL regs = int: %u, frac: %u, post: %u\n",
+ pll_int, pll_frac, pll_post);
+
+ if (pll_post) {
+ int fin, fsc;
+ int pll = (28636363L * ((((u64)pll_int) << 25L) + pll_frac)) >> 25L;
+
+ pll /= pll_post;
+ v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",
+ pll / 1000000, pll % 1000000);
+ v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",
+ pll / 8000000, (pll / 8) % 1000000);
+
+ fin = ((u64)src_decimation * pll) >> 12;
+ v4l_dbg(1, cx25840_debug, client,
+ "ADC Sampling freq = %d.%06d MHz\n",
+ fin / 1000000, fin % 1000000);
+
+ fsc = (((u64)sc) * pll) >> 24L;
+ v4l_dbg(1, cx25840_debug, client,
+ "Chroma sub-carrier freq = %d.%06d MHz\n",
+ fsc / 1000000, fsc % 1000000);
+
+ v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
+ "vblank %i, vactive %i, vblank656 %i, src_dec %i, "
+ "burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x, "
+ "sc 0x%06x\n",
+ hblank, hactive, vblank, vactive, vblank656,
+ src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
+ }
}
/* Sets horizontal blanking delay and active lines */
@@ -599,7 +672,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
* configuration in reg (for the cx23885) so we have no
* need to attempt to flip bits for earlier av decoders.
*/
- if (!state->is_cx23885) {
+ if (!state->is_cx23885 && !state->is_cx231xx) {
switch (aud_input) {
case CX25840_AUDIO_SERIAL:
/* do nothing, use serial audio input */
@@ -622,7 +695,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
/* Set INPUT_MODE to Composite (0) or S-Video (1) */
cx25840_and_or(client, 0x401, ~0x6, is_composite ? 0 : 0x02);
- if (!state->is_cx23885) {
+ if (!state->is_cx23885 && !state->is_cx231xx) {
/* Set CH_SEL_ADC2 to 1 if input comes from CH3 */
cx25840_and_or(client, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0);
/* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2&CH3 */
@@ -662,6 +735,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
*/
cx25840_write(client, 0x918, 0xa0);
cx25840_write(client, 0x919, 0x01);
+ } else if (state->is_cx231xx) {
+ /* Audio channel 1 src : Parallel 1 */
+ cx25840_write(client, 0x124, 0x03);
+
+ /* I2S_IN_CTL: I2S_IN_SONY_MODE, LEFT SAMPLE on WS=1 */
+ cx25840_write(client, 0x914, 0xa0);
+
+ /* I2S_OUT_CTL:
+ * I2S_IN_SONY_MODE, LEFT SAMPLE on WS=1
+ * I2S_OUT_MASTER_MODE = Master
+ */
+ cx25840_write(client, 0x918, 0xa0);
+ cx25840_write(client, 0x919, 0x01);
}
return 0;
@@ -1123,6 +1209,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val)
cx25836_initialize(client);
else if (state->is_cx23885)
cx23885_initialize(client);
+ else if (state->is_cx231xx)
+ cx231xx_initialize(client);
else
cx25840_initialize(client);
}
@@ -1178,7 +1266,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
v4l_dbg(1, cx25840_debug, client, "%s output\n",
enable ? "enable" : "disable");
if (enable) {
- if (state->is_cx23885) {
+ if (state->is_cx23885 || state->is_cx231xx) {
u8 v = (cx25840_read(client, 0x421) | 0x0b);
cx25840_write(client, 0x421, v);
} else {
@@ -1188,7 +1276,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
state->is_cx25836 ? 0x04 : 0x07);
}
} else {
- if (state->is_cx23885) {
+ if (state->is_cx23885 || state->is_cx231xx) {
u8 v = cx25840_read(client, 0x421) & ~(0x0b);
cx25840_write(client, 0x421, v);
} else {
@@ -1369,6 +1457,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val)
cx25836_initialize(client);
else if (state->is_cx23885)
cx23885_initialize(client);
+ else if (state->is_cx231xx)
+ cx231xx_initialize(client);
else
cx25840_initialize(client);
return 0;
@@ -1477,10 +1567,12 @@ static int cx25840_probe(struct i2c_client *client,
}
else if ((device_id & 0xff00) == 0x8400) {
id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf);
- } else if (device_id == 0x0000) {
+ } /* else if (device_id == 0x0000) {
id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
- } else if (device_id == 0x1313) {
+ } */ else if (device_id == 0x1313) {
id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
+ } else if ((device_id & 0xfff0) == 0x5A30) {
+ id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf);
}
else {
v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n");
@@ -1503,6 +1595,7 @@ static int cx25840_probe(struct i2c_client *client,
state->c = client;
state->is_cx25836 = ((device_id & 0xff00) == 0x8300);
state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313);
+ state->is_cx231xx = (device_id == 0x5a3e);
state->vid_input = CX25840_COMPOSITE7;
state->aud_input = CX25840_AUDIO8;
state->audclk_freq = 48000;
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index be05582..93941be 100644
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -50,6 +50,7 @@ struct cx25840_state {
u32 rev;
int is_cx25836;
int is_cx23885;
+ int is_cx231xx;
int is_initialized;
wait_queue_head_t fw_wait; /* wake up when the fw load is finished */
struct work_struct fw_work; /* work entry for fw load */
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 0b2dceb..0df53b0 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -25,6 +25,7 @@
#define FWFILE "v4l-cx25840.fw"
#define FWFILE_CX23885 "v4l-cx23885-avcore-01.fw"
+#define FWFILE_CX231XX "v4l-cx231xx-avcore-01.fw"
/*
* Mike Isely <isely at pobox.com> - The FWSEND parameter controls the
@@ -96,9 +97,17 @@ int cx25840_loadfw(struct i2c_client *client)
u8 buffer[FWSEND];
const u8 *ptr;
int size, retval;
+ int MAX_BUF_SIZE = FWSEND;
if (state->is_cx23885)
firmware = FWFILE_CX23885;
+ else if (state->is_cx231xx)
+ firmware = FWFILE_CX231XX;
+
+ if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
+ v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
+ MAX_BUF_SIZE = 16; /* cx231xx cannot accept more than 16 bytes at a time */
+ }
if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
v4l_err(client, "unable to open firmware %s\n", firmware);
@@ -113,7 +122,7 @@ int cx25840_loadfw(struct i2c_client *client)
size = fw->size;
ptr = fw->data;
while (size > 0) {
- int len = min(FWSEND - 2, size);
+ int len = min(MAX_BUF_SIZE - 2, size);
memcpy(buffer + 2, ptr, len);
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index e77f81b..3e107d5 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -87,7 +87,8 @@
#define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */
#define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */
#define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */
-#define I2C_HW_B_HDPVR 0x010024 /* Hauppauge HD PVR */
+#define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */
+#define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */
/* --- SGI adapters */
#define I2C_HW_SGI_VINO 0x160000
--- NEW FILE patch-2.6.29-rc8-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJvZc3yGugalF9Dw4RAnitAJ4giK8VMVgmN6jhwp6e9mWJuFeGdwCfddkj
Lv6B1wHur1mgk2HzkrWPsPI=
=kj/v
-----END PGP SIGNATURE-----
--- NEW FILE patch-2.6.29-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJud6vyGugalF9Dw4RAi59AJ46IxrRi8gfTikGOfe4LBW7ukwcgQCeMSQz
mB+94unFITUPKld3rfo0gXA=
=ShaR
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.6
retrieving revision 1.1014.2.7
diff -u -r1.1014.2.6 -r1.1014.2.7
--- .cvsignore 12 Mar 2009 20:38:55 -0000 1.1014.2.6
+++ .cvsignore 17 Mar 2009 21:35:45 -0000 1.1014.2.7
@@ -5,5 +5,5 @@
temp-*
kernel-2.6.28
linux-2.6.28.tar.bz2
-patch-2.6.29-rc7.bz2
-patch-2.6.29-rc7-git5.bz2
+patch-2.6.29-rc8.bz2
+patch-2.6.29-rc8-git2.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.9
retrieving revision 1.238.6.10
diff -u -r1.238.6.9 -r1.238.6.10
--- config-generic 12 Mar 2009 20:38:55 -0000 1.238.6.9
+++ config-generic 17 Mar 2009 21:35:45 -0000 1.238.6.10
@@ -2230,6 +2230,9 @@
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_IVTV=m
@@ -3886,3 +3889,6 @@
# CONFIG_XEN_GNTDEV is not set
# CONFIG_EVENT_TRACER is not set
CONFIG_XEN_SYS_HYPERVISOR=y
+# CONFIG_X86_CPU_DEBUG is not set
+# CONFIG_KEXEC_JUMP is not set
+# CONFIG_FTRACE_SYSCALLS is not set
drm-modesetting-radeon.patch:
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.54.6.5
retrieving revision 1.54.6.6
diff -u -r1.54.6.5 -r1.54.6.6
--- drm-modesetting-radeon.patch 12 Mar 2009 20:38:56 -0000 1.54.6.5
+++ drm-modesetting-radeon.patch 17 Mar 2009 21:35:45 -0000 1.54.6.6
@@ -1,4 +1,4 @@
-commit 35b84c0dc0b9c007e542a448417f0341ddf78cd1
+commit 784e2287e60f91c16814fbb757ea316b3027ddd1
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Mar 12 11:39:05 2009 +1000
@@ -17,7 +17,7 @@
Signed-off-by: Tom "spot" Callaway <tcallawa at redhat.com>
-commit 547fe8513d4058efb8fe0eed856c7531305b320f
+commit 42a73c53bce752bca305c4ec40bff9873042ba6d
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Thu Mar 12 10:58:05 2009 +1000
@@ -26,7 +26,7 @@
This makes the IB get routine a lot smarter and hopefully
fixes some cases where it exits
-commit 7d0361c240495ee5ed5c5a4490084dc258e1eda2
+commit 64e61a039f5e28b5d288fd2b50d44d3d42327976
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Thu Mar 12 10:57:17 2009 +1000
@@ -38,7 +38,7 @@
only happens on r300 hw for me
-commit 7dab6d7b968d623b3c2f99173590f17c7cc248b6
+commit a446cfcfdb7d6c4b23796d6bd1fccba058543ad0
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Mar 11 18:50:06 2009 +1000
@@ -46,7 +46,7 @@
this debugfs entry just does a driver suspend then resume cycle
-commit 2c1f8464844f8760563e70499de38a8070031d9e
+commit 925bbb6856b01660b850c43de6629de14bd9435c
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Mar 11 11:40:13 2009 +1000
@@ -54,13 +54,13 @@
this just prints the page counts in debugfs
-commit 85510fb358cb3c0e3d526a93389a8d847b7398c0
+commit a242a63b023ebf698c62880cfabbc210359555c0
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Mar 10 19:01:37 2009 +1000
radeon: enable kms on r100/r200
-commit cd45bd5f01fb0294befd98ced95e46e3a6983d2c
+commit 822b8822b3573e2a4ed442e1a26a7433e9c6f503
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Mar 7 19:11:20 2009 +1100
@@ -70,7 +70,7 @@
using cached pages on PCIE ftw
-commit b34c746ed223c60c3c8aa2b9f707eaaf9e0427dc
+commit d34ffa0883066740a6871ec3e2f397ddade48dfe
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Mar 7 17:55:11 2009 +1100
@@ -82,25 +82,25 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 121cc720f350cc7a34af1d8a3c002266ba990d9b
+commit 91f056b908e2472964509e3aba8ccec2140592e7
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 16:42:06 2009 +1100
radeon: add depth offset reloc properly
-commit e2eeb3497972e391e519c2139a5ac9fd32dadccc
+commit 3a40047a3d1a5658a283ed802a2ccb38fbe000b0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 16:25:38 2009 +1100
radeon: r100/r200 add depth offset check
-commit 9abfacf388ee1f62cd2f19b32639372b781cd9b7
+commit adb5d6fe30c2b003a9ea7d6abf365de6ef88a63f
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 06:07:38 2009 +1000
radeon: add some more texture relocations for r100/r200/r300
-commit e039bd0f71b17bad18724b5fbb0c1f72be737de2
+commit 99940847a43e85eef8ec075d2d178347b98780d1
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Mar 5 15:57:18 2009 +1000
@@ -108,19 +108,19 @@
This is half ways between a hack and really neat.
-commit bd274a6fb4d9bd78e2467620e6c5898c209dfb12
+commit 9ead2858b35181f37e660aaff30af9ee1ff14bfe
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Mar 3 18:23:22 2009 +1000
radeon: port proc debug files to new debugfs interface
-commit f5b2321e7d646e6e7438911e811a973e34270abb
+commit 83a2415a2720f7fc07cd1f6334a755f834ab3d75
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Mar 3 15:33:52 2009 +1000
radeon: pin framebuffer and cursors dynamically
-commit dfe5afc942903cdf9240db9da3670bae07742f85
+commit 16d58ae58d87c3feeb414a7ef7afb40f33053027
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:25:36 2009 -0500
@@ -128,7 +128,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 1c653f0dd7ca80b57be396b5af67f18a73ce6bbc
+commit 7692f2d71d92b1bfb0b97ede2ff0b690fd4894f8
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:18:20 2009 -0500
@@ -136,7 +136,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 709a927cf8b67b87086e7cf97cc8916f9b9106f9
+commit 1b3271400bc2ca8418104fa5fbb71573af5cb324
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:15:04 2009 -0500
@@ -144,7 +144,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 1be02ac8d9307f2aeb1190dd1e08f8588020b273
+commit fb790159474e58c3dd788bd345c38400c5939654
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:07:13 2009 -0500
@@ -152,55 +152,55 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 4e200d8a0063650385096ab6485dea9d428acecb
+commit 24591069e1bd6e1106aac024323cfbc9631fd4c4
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 2 23:51:30 2009 +1100
radeon: fixup suspend/resume hooks
-commit b6cd6f6b0c543380381fd730031831e62da3fbda
+commit 7782b006a8db3d0f07a20dd5d4797e43ab9e13fb
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Mar 1 18:25:07 2009 +1100
radeon: fix rs480 gart size
-commit 59109f23bf6e835e80d43d138f22520882618a7c
+commit 7c585cb128aa768a826c24739a4b3e4369df117b
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 15:37:14 2009 +1000
radeon: disable kms by default for r600
-commit 0b64e6b2ba58ca37f8c40d3954b523e44d691430
+commit 3115c7aa9402afa66a1cf4e4461ff3d7e35e82e2
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 11:51:22 2009 +1000
radeon: fixup proc hacks
-commit c83e971d04031798907c5d1b3a6dfeda9eb7bbd3
+commit 4f6c693f8e6fa1aa9fcce2b26ac59396c0285af6
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 11:51:08 2009 +1000
radeon: fixup module load
-commit 3642c37a553efb63c1835da912731b131231dd3e
+commit 484d0aee4f8915ba5aef53f76b6fbfa1cbc23a0d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 11:50:50 2009 +1000
radeon: fix up ring read/write for new drm-next code
-commit 9a66ef9814ccf8dded0d59a14da04f10d3082708
+commit ce9a28c8309cb06515c9a6d5c20ccb70b72c32d5
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 11:50:24 2009 +1000
ati_pcigart: update pcigart for changes in drm-next
-commit 2e236e8f40317c3bf944e8214829aa22669de489
+commit 8661681fcf12fe160f5f8ed6921043f5fff6c5ef
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Feb 26 22:27:21 2009 +1000
radeon: fixup writeback/ring ptrs for Kms
-commit de3c748976b7fe35bf1cb0d8ddfd006698d9fcf3
+commit 97f11e2435d2be0600cf1fcaf8d89f8c5b03513f
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Feb 26 22:00:59 2009 +1000
@@ -208,19 +208,19 @@
lots more to do
-commit 26ae113e4e1eeb7c0f6b54fb9426173875f1302a
+commit bd35ba9cb7a9370d9673ab75e5aa2bce9263b13c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 12:03:55 2009 +1000
drm/radeno: add support for r100 cp type 3 packets
-commit 6396d153c51a88225f48f32a06bf32f763976631
+commit 1f77ec773d71af4efe399ac060d3cdb8ccef709a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 25 16:07:15 2009 +1000
radeon: fixup cs buffer re-use code to not block straight away
-commit 16b03d4bd01e196283b6022fcf9d1cfcd8a9dd8e
+commit a7cb271555a8a1629200c018f75357d5ccf93653
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 25 16:06:30 2009 +1000
@@ -228,37 +228,37 @@
Totally missed this before - really helps stability
-commit eb42460c14c46ca57a4db94245ae678d9c745e2d
+commit 6e37f09d3c1c96507bfc48a1c3994e50d6289fdd
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 25 13:03:47 2009 +1000
radeon: fix IB dump end
-commit 551ac6e7de26f8a8a9bfd6cd4a768968a4e5f82a
+commit 0561beb6ffcddd33b87dca401e22da5a769c6d5d
Author: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Date: Tue Feb 24 20:26:53 2009 +1000
drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap
-commit e248a04dd2ad1b38b9f25bf6d60f4423595d7c7b
+commit 96510ff0b515e07a2ab865cc458c921c2107761a
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Feb 22 08:22:14 2009 +1000
radeon: add module IDs
-commit 28b0b74dae8edd5b99f4067f251700fbd6f45f54
+commit 7e8360d49d9b1566f2319c46a2eda06b9b16b595
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Feb 22 08:19:33 2009 +1000
radeon: fixup for new APIs
-commit 67007e9c5d1cf3aed713d8fcb9e49991441685ea
+commit ab702fcbbd15a90841358fbd6c14796b6f308a9f
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Feb 22 08:11:33 2009 +1000
drm: fix parmeter passed to fb_release
-commit 683d802a7122ae6463a100d4db87a030a6e5b789
+commit eb2f2738c670e9aa1e75d4b81b64bc476a741f30
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 18 17:36:33 2009 +1000
@@ -266,13 +266,13 @@
this adds basic IB dumping and cleans up some code around it.
-commit d4f11e7e4c971bcb955a6e6d5f91ad219fec4d8b
+commit e09ce4db2b342eb6e681f8ab577b3d3a13fef0e7
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 18 11:12:19 2009 +1000
radeon: fix packet2 parsing + enhance debug
-commit 82f9be7accb1ba4868a51dd7dfb392fb150ef243
+commit de85e403bc70e674eac99ad5f4ff3defc536c835
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 18 11:11:39 2009 +1000
@@ -283,37 +283,37 @@
It also doesn't or in the table values but sets them
-commit 88c0d5f8cf3007d48b761e7d33ccbe9964152289
+commit 588d26eb3988a7a59a08f659f1a82dfa203cb846
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Feb 17 20:57:34 2009 +1000
radeon/i2c: i2c adapter id is gone
-commit 7af3f24aa54f3b8a8c5e59e4cd3c25e1e39a6d35
+commit 60f1128ecb9b0046d9cc18c2eb235573303d12e6
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jan 22 17:15:56 2009 +1000
drm: fix radeon Kconfig
-commit 0e15e446001ecd67ce0fb740092cbca61f9920cf
+commit b70fa2444b6b52149ad9074858e22285dcca0ae8
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Jan 11 19:50:23 2009 +1000
radeon: add missing Kconfig text
-commit a3593ea46217392fe98040f6c4eae20f173a0641
+commit e57d8c584f0de8728df62733606db6eda18816d6
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Jan 11 19:47:39 2009 +1000
drm: fix merge issue that messes up irq
-commit 12a869aeee1d43d75077ccb0742e1d6672c0cff2
+commit 3701bf32a210c648082cb7ab1ec5afb42710a5ee
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Jan 10 12:40:42 2009 +1000
radeon: add getparam to get pci device from userspace
-commit 41eab9945df058e15d22a5cda4aed0e086e5412c
+commit 3504ddf695c726e8fa798931db1e6aa244109709
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Dec 18 23:01:12 2008 +1000
@@ -322,49 +322,49 @@
This should make AGP no corrupt itself to all buggery
(cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
-commit 79a4aa259b41457361c94c24b74c550e52079705
+commit dd56df1b0d1cc454cb17b329d1445d6bd25e1fde
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Dec 2 16:38:04 2008 +1000
drop old CS
-commit 14d3a512b1da85fed4dcd8d18e7e414dbd8bce39
+commit b9aa3bc338469181fcdee15a2c40a83aa30781b3
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Dec 1 15:09:27 2008 +1000
radeon: update with latest CS bits
-commit 830554d3eb003dbec5ab456aba80be5b082d0933
+commit ef068c51a1a88ec65302ec1836ec70f19516683e
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Dec 17 06:56:36 2008 +1000
fixups post rebase
-commit a860582dfdad05de769b83f23af7da17766b6a7a
+commit 1241be1d23211e23c55e59394ce0d44c1cad8e2c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Dec 11 01:35:09 2008 +1000
radeon: fix agp mode when kms isn't enabled
-commit 1b831e0840b8fef20634c5f5ca18b275494705ee
+commit d31dc52a2fc12d73b6969a896acd3c074d04dfef
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Dec 3 17:22:07 2008 +1100
radeon: add support for accessing disabled ROMs.
-commit a09ca5260b48b00d28c454ceba71265d9b7de301
+commit ba9117de78c932b27162bff12cdf299da01ee1b2
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Dec 3 17:19:02 2008 +1100
radeon: make cail do pll read/write via actual PLL functions
-commit c214949d354de7e6e6306cb90deaa7253aa7d913
+commit 683b1fb12a30a7ab78514851b9aded88f1e78449
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Dec 3 16:36:00 2008 +1100
radeon: atom fixes for endianness
-commit 5731a00b153b2dd550586e84fde9feef6c2d4212
+commit 93a843dfd189774ff5c41981242abb5a7dafeb07
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Dec 3 20:28:05 2008 +1000
@@ -374,7 +374,7 @@
Limit the AGP aperture to the GART size, and init the registers
in the right place
-commit 809221e8bf8410dd723c5ca51de5200eddf4387e
+commit abb18b25eb45f716ec8eae8fcf5d3f5610b4feb3
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Dec 2 12:49:17 2008 +1000
@@ -383,7 +383,7 @@
1. Proper PCIE fallback on PCIE cards.
2. Setup agp base + location regs properly
-commit 80dcec25a55f4572cc666a87613f1876c69f58e5
+commit 058ad4615ea9471a973366f9062d85194d3b3495
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Tue Dec 2 08:06:59 2008 +1000
@@ -391,13 +391,13 @@
fedora bz 473895
-commit ff1f9d13924fba428d039b18ced9f9a65ba0915c
+commit f2bd4be50fcbe9c1fd54644aecc5c61ab9222ea4
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Nov 27 17:14:40 2008 +1000
radeon: post any GPUs that aren't posted
-commit b2f4666ef616c190eb545d635183568043e170f1
+commit 81ea7ffb29bfc78a13ca546422d0b188ab6ec101
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 24 15:18:31 2008 +1000
@@ -408,13 +408,13 @@
Default to 512MB gart.
-commit 3206705ff8403525291eccfc8cca47ff246d3b21
+commit 1d15b0e6c0cbf95e3c7dc931527523e2e5c45bd6
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 24 15:17:49 2008 +1000
radeon: add some missing feature checks for modesetting
-commit 7decf0c32c01a0ffb7590271771197859fe26770
+commit d08bd82db3a70a904cfd831d2f67f4248c5efe80
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 24 11:41:06 2008 +1100
@@ -423,43 +423,43 @@
we really need to read back to make sure the invalidate has happened
before continuing along happily in life.
-commit 312496e7a43b9df395acbecc53272f6d866300ad
+commit de54495e7eda055b11b3358ae5d53c065e3c900f
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 23 19:19:02 2008 +1000
drm: we have discardable now so don't do special cases
-commit 6e1e6dbe649721345943bf58740bf3dcefedad8f
+commit 06e6511a0b693796c9231d6b0db45d6911d15030
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 21 14:52:25 2008 +1000
atom: fix bug in parser for MC reads
-commit 8b5d3666aaef086ca4456a452a2983414a2fd9d4
+commit 0e09d9e03eccdf270aead5cc41dbbe7ea2495714
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 18:14:28 2008 +1000
radeon: turn of VRAM zeroing by default for now - needs work
-commit 1996c2ba79351996635d04c4ab9149f436eb7294
+commit 41be3b7a94a274963156d423ae1a9ca9d4894a43
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 09:03:36 2008 +1000
radeon: fix return value for no relocs
-commit 164fc5078364a42262d8fd2a8c0bc4bf36a03c82
+commit 3bbfc5e700083ad501f7df0ea48e4d24927621f6
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 09:03:01 2008 +1000
ttm: add discard for VRAM buffers
-commit 07516743f53ddd91d8cbe64d7f9eb15e6ac99393
+commit ba3a97b9464f741e6b152af9d75a0d11e988cbee
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Fri Nov 14 15:52:32 2008 +1000
drm: fix the exit path of the bo unlocking
-commit 5f2a4e386644c556945472e4e62905980c1707eb
+commit b34a9a4845c9452a335c2c6657f5a8d455cdce43
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Fri Nov 14 15:51:44 2008 +1000
@@ -467,43 +467,43 @@
Fixup failure paths and make EAGAIN work
-commit 6b53199631b4663935b537d4af94b8226d714292
+commit f56355983e05ec412db7a53ed6f0f2ea6dedaf68
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Nov 13 17:22:26 2008 +1100
radeon: fix some issues since last rebase
-commit fe6cfbd92f444ec0c8a4764b70b3ccef6d0adbcd
+commit 6f6ca8cc21c4ebf192dfb9f342843ec2fd7bc66c
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 09:01:14 2008 +1000
radeon: fix more build
-commit 93e2435814ba5d05e3c68d3095923d342ad233de
+commit a555b1fb3aecbabd7220ff9d97ed77f98c1a8e30
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 08:59:04 2008 +1000
radeon: fix compile
-commit d249f5e92393cee7585fff0cc0f57b2a568f058a
+commit 1f1e2c149cfe3abe664c3f080cc07d9e99556f62
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 10 14:26:11 2008 +1000
radeon: add gart useable size to report to userspace
-commit 4e6436d3188aef52d6b31fa0b25d2e44b98056d2
+commit e55967dc8024845777ed569ce738c89ce4cd3b3f
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 9 20:34:49 2008 +1000
radeon: fix powerpc oops on rv280
-commit 8a03ca851e33e067981aa33648c4aaf536b5ae18
+commit 27035d01038192331741acc113c79898ab9e24d7
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 9 10:23:43 2008 +1000
radeon: upgrade atom headers
-commit b33502e29664f2414eac9c9aeed8f0d4416ec93e
+commit 7a194d6fb0152150cda0108c0942c0d8966991dc
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Nov 8 14:39:41 2008 +1000
@@ -512,13 +512,13 @@
For some reason reading the SCRATCH reg from RAM causes some race to occur.
Hopefully fix this.
-commit 79b1e7caf75eac0569942c3ee23d9e6e1fff4c67
+commit ad55e833aacec9c461679dd3368ee6c764d303f5
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Nov 8 11:31:03 2008 +1000
drm/radeon: add dpms connector functions
-commit e7d9e11e35a1c96917308889bb78d0ac12073e67
+commit 7edf361f44213aa6ee694341ee16b3128878e4cb
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 7 16:22:22 2008 +1000
@@ -526,13 +526,13 @@
fixes cursor on second head
-commit 149420076a621cb9510b7a303d822cce1eb7fa85
+commit bc74cc35de478b6b510528342fd042f62a6f758e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 7 16:21:03 2008 +1000
modesetting: set the crtc x,y after the mode base change
-commit ef18b7de77e1833cd0a71b0143bc8b94d7b4584b
+commit 8984a210384371210a4dd65d7d09b5fbe884c279
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 5 10:23:35 2008 +1000
@@ -540,31 +540,31 @@
This allows re-use of uc/wc marked pages
-commit 2966196cdd272216b5a2b18f518854c20108ce65
+commit 2963f17da234c3a99c97ea95f2423bd8a7927fd6
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Nov 4 13:18:02 2008 +1000
radeon: disable HDP read cache for now
-commit 17edb7f743f87439ad277b36771dc48fc79fd01e
+commit 5988c5ade2e1af09afbd07ce2800f873b70ce86c
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 3 15:43:08 2008 +1000
radeon: fixup vram visible calculation to take a/c pinned objects for now
-commit 6f047bee0334d27ecf472c42365cbb53047aca13
+commit 7fd018009e6b72d720d403df1ad3456d82c0b92b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 3 09:56:02 2008 +1100
radeon: if modesetting state is unknown make it known so pm-utils can use it
-commit 83ef7cc84d460b79c8cf0f2561d15fb3c48f3b7b
+commit 17fc997cb212f173fd6f2f905e0df3691f462d01
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Oct 31 14:40:12 2008 +1000
radeon: fix ROP values for the paint ROP
-commit e59eee09c376a23083e4611602becd8cb784f85a
+commit e9e4b293acc1db686b09db4ac9ddd0c82e6c724b
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 14:00:39 2008 +1000
@@ -572,43 +572,43 @@
This speeds things up a bit
-commit 6b279dc10dce026518179958ad4c772e63b19a7c
+commit a1db6e421844582c5c2670ffe1c37242ae84052b
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 14:00:15 2008 +1000
radeon: disable AGP for certain chips if not specified until we figure it out
-commit c2f8f0621f88dd214c27aaa4145820e751d6d104
+commit e83598229e434f177250f020985d24af018a9b9c
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:45:47 2008 +1000
radeon: disable debugging message
-commit f2b541c168e0aef790f03fcfd36d76d723787c39
+commit ca2fe015f5f42c466502ede6e6ccda4fd937ee9f
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:37:32 2008 +1000
radeon: commit ring after emitting the buffer discards
-commit f5571843ad266102bb4cd93f640bbfa730df9b61
+commit b1717d03dd2a699ca688b4a639a09ea4bf9d2313
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 17:39:27 2008 +1100
radeon: fix whitespace in encoders C file
-commit 7a0aabb129d581663ba207e63342d8256bd60353
+commit c781844094860fcf30cf16143ebe5e92cb1c12e5
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 17:39:08 2008 +1100
radeon: add more HDMI bits
-commit 66383dea1fa552976b6f0653eb04f1b061f91c03
+commit 417d345ee977ffc4d950597d9cdb181c6287090c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 01:41:34 2008 +1000
radeon: set dma bufs bo type to a kernel type
-commit 0e85ebe0bc716bf6a2b4eb9b884538ca55197f72
+commit 5dc64fc0a90025c6c7b1053f5f1f29d6acccede4
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:46:16 2008 +1100
@@ -616,19 +616,19 @@
This allows the rs690 to work on DVI
-commit 588f5064301b3ab9776faeaca9fa9343516f63b5
+commit 23a70cc8482b3aadb19e5bbbdb30c7cd4ea7266a
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:33:13 2008 +1000
radeon: setup isync cntl properly
-commit 4b004f17d087b7d3b05b1aa7d3da1ccacb3cf227
+commit 72f55b0a4166baf039ee90cb5e21286735275a3b
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:31:27 2008 +1000
radeon: add more debugging
-commit 256fe7ac7d23d254d55c0eceab0a2e30e666a91c
+commit d59b80d782868977e77733346a047d909bb6091f
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:26:04 2008 +1000
@@ -636,79 +636,79 @@
emit in 16-dword blocks, emit irqs at same time as everything else
-commit c03beb43a3958c560c45f0985b0e9095cace1024
+commit cf8cc765cdb4dc2128e52ca8a021ee253b45601f
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 16:46:47 2008 +1000
radeon: add proc debugging for interrupts/ring
-commit f43ad0f2d7d5844a95c7792e9657823b7bda8269
+commit 21bf94ff31b89adafffee51f539c0fd27a830634
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 16:44:54 2008 +1000
radeon: only enable dynclks if asked for
-commit 7611a729b6f821c6ec025fa79b959c87d2372574
+commit eba1e5c008cbdd51582cefb343665dffeb9d6486
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 06:35:10 2008 +1000
radeon: add wait rendering API
-commit 9c0ef8d1ee719adbae91776d7830b034cea7a80f
+commit 737fe64e00f7ea1c06609c5ed16a6f96fcde6785
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 18:30:15 2008 +1000
radeon: remove unused gem indirect ioctl
-commit d1a9729dd7ea3629340587c9b40de38a628cad1c
+commit 609017c72354fe0f7e8d4b1274eedbab2d1bd0e5
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:41:09 2008 +1000
radeon: fix some warnings
-commit e27e8b840b20e2db56a5f9ea82669a725e44ee97
+commit 4d3142fbd7e1932ac82a9f395355c446221bcbdc
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:40:34 2008 +1000
radeon: fix free after refcount
-commit 86622cccc891397fca746a246342ef390f5ed66e
+commit 918a5ee68ca046792584f9480eb26d06578e480e
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:40:15 2008 +1000
radeon: CS2 make it all work with new relocs style
-commit cf4211732c0826e47c0ee5845e592245867e7223
+commit d01017943d66382cbe9b2375d93c5264d7a6f502
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:39:12 2008 +1000
radeon: don't copy to user the cs ids
-commit 2886f4709e0de2ad8aa2fcda00630a01e98443d1
+commit b75bef596d819874d80e68c0a8ceedfd3d1c32c2
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 14:23:22 2008 +1000
radeon: make new CS2 command submission interface port older interface to this
-commit 0307426c1d0517c758c9aca5e274d689f8cda06e
+commit 8d74028ea013bb3fe4a12cd3f16a4a9698bd8d75
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 23 19:13:50 2008 +1000
radeon: release agp on module unload
-commit c4c6a3c7061cbe38e1aebe19c8e9038e83613d27
+commit b23ed94e6b6922961f0eca13aa0287590e268c89
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 21 14:15:23 2008 +1000
radeon: add r423 bits to modesetting
-commit 2cc60c202afdb5233993d25d36aefa6c561c2586
+commit 4b4ce8baaa42247234b41b5dfdbaec13e17a9758
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 21 14:12:38 2008 +1000
radeon: pull bus master enable into its own function
-commit 8d1312eda42e7d851fc0a252b4386b4d65d00ba7
+commit 9f711306e2a8d2a681f135b111a1f9a7693eb8be
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 14:44:23 2008 +1000
@@ -717,67 +717,67 @@
We actually were passing accessible to userspace, but I thought
the code sized it correctly, however it doesn't seem to.
-commit edf47666be04c602fe6bea5cf9d4c0342fb80538
+commit f10ef5f15b063817bf98bf2d9a65bf09afb8849f
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 13:41:05 2008 +1000
radeon: update proper chip family
-commit 761ede6f2802671863d11d92cefe0b741006bcfe
+commit 7d91926fcc7a5095f6dfd8a5e726f2305d4d4db7
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 12:08:50 2008 +1000
radeon: fixup scratch register interactions properly
-commit 914b95db67a7b88ec997059d6445deda5b411d5a
+commit 962ab808277f95ec6b415cbf28e138ca4b46d49f
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 10:27:50 2008 +1000
radeon: make writeback work again
-commit 2a28a9d058129c1b9b55db984ba21f1d4ebab77f
+commit 7ed1c134e23687851ca719ddb12e4b08a8c2ec6a
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 09:20:23 2008 +1000
drm: cleanup some warnings
-commit 2f075376d42529a5601e207082e2f77735e3f03d
+commit 4132aec3cb061addec919558b69aad3fd34d4733
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 16:29:08 2008 +1000
radeon: fix small typo in agp code
-commit 43798d2e4f3b411958eb64d9dd01d209151b07bd
+commit d8c32ab19b86a3f7f98f3e0ce481eb5b446d4c01
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Oct 16 16:17:01 2008 +1000
radeon: workaround failure to parse some rs48x edid
-commit 8d6af9be3705511a343cf2e50b36f49ae865b997
+commit 020c166b9d8ba4d79874fa7c9d85668e07949aea
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Oct 16 16:15:08 2008 +1000
radeon: don't enable dynclks on rs48x
-commit 8b2cf6807eeebf01aa9b7615e0b74eefa4b85a4e
+commit 4e2baff6418e4620511442166f85a785cd526980
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 15 15:12:20 2008 +1000
radeon: allow r100/r200 modesetting to be forced on by users
-commit 6258201b624ef976060cbab6b5dfeaa865f3e6a2
+commit 6af6c74ebeda26100e42a8146a8d6447fa8109ea
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 22:06:00 2008 +1000
radeon: fix unused agp functionality
-commit e3063ac5c06634f93c11b61ea65b9505ccf237fc
+commit 3c38749ec90a0766d95147412a0bd52d5cb06c58
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 22:05:02 2008 +1000
radeon: add some more r100 support to test AGP
-commit 30fc2390c1206e81457ba21b9fc32e0ad2fe678d
+commit d495f4f8d2bcfeb4449b80cee5022993e65c470c
Author: airlied <airlied at redhat.com>
Date: Wed Oct 15 23:58:03 2008 +1000
@@ -785,55 +785,55 @@
This add agpmode command line option.
-commit edd8423eab59f95fe78afaab913ee07bed9b491e
+commit f3e2b97a301a33e6d2debc08258faea5f8c05d4e
Author: airlied <airlied at redhat.com>
Date: Wed Oct 15 23:57:21 2008 +1000
radeon: add CS support for r100/r200 in 2D driver
-commit 4c40ab66e516835c830522520810d8e8568bcc85
+commit bdedf6ab856c80ba82066856150a8c9cdd9937ba
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 9 16:37:23 2008 +1100
radeon: fixup interrupt suspend/resume
-commit 0268699b5e507d3c798ec0116a50d0317903a4c6
+commit 60991dbc9263ab12edb934895f67416b9f574be6
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 8 16:57:12 2008 +1000
radeon: fixup suspend/resume bus master enable
-commit 6771715974b0762b581dd28b0c6e6da6046d6e1f
+commit ea41758aacdb0a5fd49eb35fc8e8dcf4210faaa3
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 8 16:56:04 2008 +1000
radeon: re-enable hw blits for copying from VRAM
-commit e1f0bf2f74ecd1e844bac82c6f3a926c9d951657
+commit 6061c6a5ca7219f61e859fc7151043eaec6ddd17
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 8 16:53:43 2008 +1000
radeon: fix buffer copying for VRAM->TT
-commit ffa1c98f896b4fe136de1836494787b896751da0
+commit c712b37f7984f383c026db11c4b2313a03e37359
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 8 16:51:58 2008 +1000
radeon: move memcpy until after CP is stopped
-commit be269a05c7a0b0a0a82e355dd3cef0b784381fd9
+commit e04aad369d476ae8145d261e309b26bdb6c5722e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:34:12 2008 +1000
drm: remove stray debug code
-commit dfc61d03cb6f72f58cdf2b5fa1e8073fd7362ff3
+commit 69ce60d4b79c5c1868233c117ec0451f63103b41
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:31:22 2008 +1000
radeon: use discardable flags on no backing store objects
-commit 9707473bf198df414d140d1f4e363a7d2161fbae
+commit 7d95c17e0101234cfa137e698eb0019d0a56ae49
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:30:09 2008 +1000
@@ -842,7 +842,7 @@
This discards memory contents on suspend/resume with the
hope the upper layers know something we don't.
-commit dfa8e82c56e8beb7c25456aaaba5c6cc2ec48afc
+commit 8b223b32a71e9130ab3dc14421ca44cc73223713
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:27:31 2008 +1000
@@ -851,7 +851,7 @@
This enables the evict code and also sets radeon up
to allow evict from VRAM to LOCAL
-commit 7f41f849fdfeaecf2790cf03054a4c1efe3059a0
+commit 1ec8a04cc9eb2a1cc7cf1e3489cb74c1b2a7636b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 6 16:20:38 2008 +1000
@@ -859,25 +859,25 @@
fixup the interface between gem and ttm for alignment. makes Xv work better
-commit 8df2fc577181a1a7609baa5791daceb13cc43af8
+commit 4bcdb0518bedb8a6eefc98e39fd53ca179e412a8
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 1 11:27:02 2008 +1000
radeon: fixup GEM pinned offset retrieval for mesa
-commit 6129cc7a4814a0ba45cd44d7002aac9d2c4e1b61
+commit f82f20ccb86e9e4c37b82ce2c33a2551461d2391
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 1 11:25:54 2008 +1000
drm: fixup clean flag handling properly
-commit ef42fa0e79bb164c3a504c62e4e3aac65ce79c18
+commit 80b0eae73e7ffa7c09d90ae702a2c04d80a2a51b
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Sep 29 14:57:11 2008 +1000
radeon: use atom for ext tmds on r4xx
-commit 49b556352e646afb11f8422429d640f9d428e2c6
+commit 81fe8e68086565245fe0aa6be46d8817d215c9bd
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Sep 29 14:56:32 2008 +1000
@@ -886,37 +886,37 @@
default is legacy modesetting. pass module option r4xx_atom
to try using atom on r4xx.
-commit 580cbde5bf712c9c9e76d73b81ff4b6e8f77f148
+commit 84de07ab947232b3cd2517e444758774d08c98eb
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Sep 29 14:55:16 2008 +1000
radeon: first pass at using atombios on r4xx hw
-commit 08cc15e19ea691e99f8c5a0c1b6788681757e9d5
+commit 51a2f865c8a84a608d3ea787837086d5345fa78d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 29 14:50:47 2008 +1000
radeon: add r600 modesetting registers writes
-commit b2b0663222bec03d298777a3fc9d3f66f9b0272d
+commit 0151e65d7e09fc68b999711d6681705df4cd0fed
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 29 14:45:11 2008 +1000
radeon: parse object tables for connectors on r600
-commit 85cf00824a1d7b57d95cc8222111b47a289a82fb
+commit b93bd30b24cadf4ab271951ddd6b79a06c6abd92
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 23 16:34:55 2008 +1000
radeon: fix minor cursor disappearing issues
-commit 97eaafe7033f44fd4095263ba0fb4b1c931293c6
+commit 25120be982d9f381c62e52d00a85b232bd0717fb
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 18:40:36 2008 -0400
radeon: Fix type in check for tmds type.
-commit f835eabd02fab838a3c2d81f283b628db524a22f
+commit 0a3ffe92bcd17d356f2f3917f9e0583a7900c8c8
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 12:00:57 2008 -0400
@@ -925,31 +925,31 @@
This lets us defer handle creation until userspace acutally asks for
one, at which point we also have a drm_file to associate it with.
-commit 620c4893322e2337bcbfec73890ee53ac85a8912
+commit 5d565e92c8c90a1292da8ef23aab84aee0f86bac
Author: Dave Airlie <airlied at linux.ie>
Date: Sun Sep 21 09:48:51 2008 +1000
drm: fixups on top of rebase
-commit 56b1d148fb5ae36b77a8a88616929438212f77b2
+commit 20856bd49696b4fa54d56723f45ec3526f3a3b1d
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 03:08:05 2008 +1000
radeon: rmx_fixup() fixes for legacy chips
-commit fb1984082185045beb436aa67aa5a709543311e9
+commit f41a6ca23427858c9d1c0201cfaea8a00f98e2d5
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 01:55:27 2008 +1000
radeon: fix combios
-commit 4d8ce6248e75e864e5da16470a5338ee1cf28745
+commit 10259619b113f44814f21d1fd92d7752225d041f
Author: Dave Airlie <airlied at linux.ie>
Date: Fri Sep 19 09:17:36 2008 +1000
radeon: port Alexs patches from modesetting-gem
-commit 385a6616e420c34b5851b3cd4fb8057cba67f8fc
+commit 62c9d770b84e6eaeadac5751663f453c83ae16d2
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:10:29 2008 -0400
@@ -958,7 +958,7 @@
Shouldn't trigger under normal use and when something breaks, it will
be easier to debug.
-commit 5284eeab2934faad2063c6d4454506a4afea018b
+commit 08abbabc989f25656689c5ba12f1bff71c21d77a
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:07:50 2008 -0400
@@ -967,25 +967,25 @@
The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
accel init.
-commit b1cb328f2b882f22a1add8da56b31b8e063df5fe
+commit 9d636d467b0b1e1da1f68a2d7270409ceffe6540
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 14:53:46 2008 -0400
radeon kms: Get precedence right when computing PLL values.
-commit 9fb52142f4966a5d697c308959df02baad94c30d
+commit c1e4d8c2575281af73f709ff56a687f3a5af07b7
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:55:14 2008 +1000
radeon: further LVDS fixes
-commit 44ce629a68dcf21471241bd662c64782a7e6b1fc
+commit 288c89b4219abe2a7f84d08ee48adc17f2de3b59
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:54:12 2008 +1000
radeon: legacy lvds updates
-commit 0e53b81b9e750ba4fcf5d0ffcc0ee37eb81cc1f5
+commit 64699b7104f450ca71284409a012459dffd38055
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:26:27 2008 +1000
@@ -993,7 +993,7 @@
just fallback around busted stuff for now
-commit 420bb28e51e4a67ce7e4b57beda203d0f5518fa9
+commit 1a082c86a3313969204c47e3771552eb4daa4d92
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:25:18 2008 +1000
@@ -1001,13 +1001,13 @@
also dirty buffer on validate
-commit 1ab9b0aa4be4447fdf92fbf55e3016db74aa1f04
+commit 8537dce4339c9a2659befb718a2628ddc9d51c63
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 17:13:32 2008 +1000
radeon: disable blit moves
-commit 2199e43ed192c9ef42684e4b048cc592c226c512
+commit 3652495eac472eb83f0e12ac7d8f5e007d71b04e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 16:18:27 2008 +1000
@@ -1015,67 +1015,67 @@
Normally this will be due to an AGP driver needing updating
-commit 4a976f85e2522bcf26a15a75961fc16f2f75cac8
+commit 68aab2f88c1c6eb87a796db64cc5f3d73e67a453
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:43 2008 +1000
radeon: do proper memory controller init and setup
-commit c9f1c2cd97a339432347a3c6b14833825c75a658
+commit 26f880377d7a61b757936c4c77dc8f272111bdf0
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:08 2008 +1000
radeon: fix return value
-commit 5ad1696f217f6f626a420d708af76ef2c120ce9a
+commit 1fb339625072fe5a001188a9cddbe4caadda134c
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:34:39 2008 +1000
radeon: fixup reference counting properly
-commit 3f0b29b7840ba25877dc2445f9ad97779d2f2041
+commit 199c9440f156105f8cbd570cbcc599e6039bfe59
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 9 15:55:38 2008 +1000
radeon: sort out atom vs combios tables for r400 cards
-commit e246ab15373406ef1d7f4c58b2c0bffd8ed9747f
+commit 3711309129bd4aebb5f4147bc290b59bd0b3e920
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 11:37:26 2008 +1000
radeon: remove unneeded debugging
-commit 1ddb69f3e68215d5ca9c3fa850588347ba31d90e
+commit 5af7d0857d796460a2c944a7e6109ec90040c554
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 11:25:12 2008 +1000
radeon: don't do full edid for detection purposes
-commit 2bd64ea1e093fb20384322025a8cfc7eebfadb73
+commit 9f9a7f7d3f2f4a2cfe453db9696c834c45427f13
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:27:48 2008 +1000
radeon: disable debugging that sneaky itself on
-commit bf7ee9ca1c05014310be2d406c159964d111e235
+commit d144ff1e6903fbced190f04baf9e3d3b803c9a79
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:20:44 2008 +1000
radeon: make text reserve 256k
-commit 4de464ee77ec2a4a1622f6a92a279b8b74a556e8
+commit 570654e5fdc1fb9f8f2b41cf754cd95d9c7c9710
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:11:27 2008 +1000
radeon: don't disable VGA bits it breaks X later
-commit 90ad5d81a1a09b2629bc661ae299ca93584a23ea
+commit 50accd8fe893bb6a6b21a461baab4f2c829ff51b
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 16:12:59 2008 +1000
radeon: further suspend/resume support
-commit 7b669f986abfd20969fea6b9a2b278f36e6804d7
+commit 3a470cc07291b364a869e38c663086c84229837b
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 14:52:15 2008 +1000
@@ -1083,13 +1083,13 @@
this gets us back to fbcon.. its dirty like zebra
-commit 1ef166842039d1d52847a5dc0c1f004502faf8f6
+commit 1bb9d532c542a25073e61e1562021c71c6dce088
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 11:15:03 2008 +1000
radeon: only enable KMS for radeon on x86 for now
-commit 741344c11e952f46a97e05f4a169c42998db0801
+commit bc8771b0676edc332a5bcde3f7a93c7e6231a21c
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 10:46:17 2008 +1000
@@ -1097,13 +1097,13 @@
Allocate the rs480/690 tables from uncached memory.
-commit 24f07b73a7f2c4287ff993c281bc6eb5860f4728
+commit 5688eaaff06782fdd63f85a57d527269663ed886
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 4 11:58:08 2008 +1000
drm/radeon: fixup some avivo/rs690 checks
-commit e8a194254a28290a02adf4301cf4684a070a5b90
+commit c5875a310503f29b500e95de1ca7f87f2c7343ee
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 09:59:02 2008 +1000
@@ -1111,7 +1111,7 @@
also change name from text to nomodeset
-commit 374022dd330c454c83d0dbb7ef80268b2de36c05
+commit 2dfd4106b9399b68af9aff3cf19b8bdfd12ed6e6
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 21:22:27 2008 +1000
@@ -1119,13 +1119,13 @@
also don't explode on lack of DDC
-commit 0e38fa74ee66e42ef67824578a462791ed1e6787
+commit 555c56a66818adaefd7844d7972258c6dfc21ec7
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 18:31:50 2008 +1000
drm: fix dev->master convert
-commit dcf2970b7c240e8f7558c4ace6a0cad0323c6bae
+commit 5d8190834ca5e404a1842addfb23037ea2da5af0
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:24:13 2008 -0400
@@ -1137,43 +1137,43 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 9c0d27d38c8ea1c547fb525188099bdc73d48f21
+commit 47b45237ae46e291a79dbc0e6947c3cc9633eebe
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:49 2008 +1000
radeon: fix LVDS on atombios - typos
-commit 48495fcb03f7fbfb361ef18c7a03978bfe94606f
+commit a6640a289339394de54205b491814a53d1d748c9
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 12:01:53 2008 +1000
radeon: limit LVDS to first CRTC for now
-commit c30ec34cb22447763fde2751266a5cc835bdf776
+commit bb4a6561447d8dc167d7e214a5e27eb6423140f5
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 12:01:38 2008 +1000
radeon: fixup checks for crtc in dpms path
-commit 5377c9fd16df95450d00c8ba87e4ffa5d2b51bbe
+commit e903885912f851d7776ce66e9868d89943a86915
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 15:39:17 2008 +1000
radeon: fix after rebase
-commit 80625b198c77ac3c6a27c47ab1891ec0e75760f6
+commit c9fda087ff394d73d606981707b5474da31dad50
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 13:43:04 2008 +1000
radeon: avoid oops on encdoers with no crtc set
-commit 1768664c9fbc160834e5dda68e11d7b2e9546de6
+commit fec34a284f41f3bf7c9873c0097a15d8a168918b
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:23:21 2008 +1000
radeon: fix warning from radeon_legacy_state removal
-commit fb71b24a9d40e483fe17f0b8feb2986f45a492d1
+commit 37b91d54a204e2232f0c816287246f1a3170efad
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:37 2008 +1000
@@ -1182,7 +1182,7 @@
- done: primary dac, vga on tvdac
- todo: ext dac, tv on tvdac
-commit af293dc1673fa0a84f38c878000d2cab6b22ae3a
+commit ff745094cf5cd97c03126bc7b2dde1234ca5059a
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:11 2008 +1000
@@ -1190,25 +1190,25 @@
- todo: updated connected status
-commit bdcda1366c379e31f316819a30749f892bd8c9ee
+commit 1492a6f175b8a937aee6a784d07b699bc6247f74
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:20:54 2008 +1000
radeon: remove unused legacy state
-commit 2db5eb9bfe54ae261d80db296b085f3822f0cc40
+commit e0e9317e039a30bead9c9f526b7e2be892a63cd7
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:20:15 2008 +1000
radeon: get primary dac adj info from bios tables
-commit 5f49a75cdc350fc5d9aed4daf8f292d533acb0c7
+commit a46bea36d470f07c8a8ac7a481f41a7f6d4883f6
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:03:13 2008 +1000
x86: export pat_enabled
-commit 574bb303096c6ed5558232a84a89a4f333d5b006
+commit 370365243118ee04955cfb8623b8f384265b01a7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:02:43 2008 +1000
@@ -1217,7 +1217,7 @@
If PAT is enabled, enable write combining support for kernel/user mappings
when pat is enabled. Also set memory to WC instead of uncached in ttm
-commit a5c57e835385ddc5ab53be38dfd719c129cf3c59
+commit 8ea6dc78dcefc6d6cd4681a1c771021b63c2a2e3
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:01:35 2008 +1000
@@ -1226,7 +1226,7 @@
move domain validate function to separate function
call it from correct places
-commit 476ff7fc90344f3dbc14eb64682140544a06c7bc
+commit 4bc8c73243388fcaabeb87d54088e3cd0e9537e9
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:00:49 2008 +1000
@@ -1235,37 +1235,37 @@
If a BO hasn't been dirtied, do a solid fill on VRAM instead of
migrating pages to VRAM
-commit 2881fdb8c64959517474af1cd506c2c14a49b436
+commit d70d73003261dca2086c1ddfb5a1f1217c146165
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 16:59:45 2008 +1000
drm: set clean flags in new flags so it doesn't disappear
-commit 944a186de12ac69445abf56329fad95bfe8ff9f5
+commit 06174f9f97435c7c08c87ea89272d0aea6646f6d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:16:20 2008 +1000
radeon: wait for dma gui idle on 2D idle
-commit fa458c4fe628b2464df777312e1f6225f9ea8fcc
+commit 358753ff54faee9b2f6f5560af9d1c321cc6d92b
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:16:01 2008 +1000
radeon_gem: fix some misplace ==
-commit d8cbf2fe532736148ff9bff7a19ac4ff3b54e65c
+commit aed542be1f7b028f83f5101e80a29c181d7ecdd8
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:13:25 2008 +1000
radeon: get buffer upload working
-commit 8e73b2ff19e59657c5952a18dfa12d2634ecd659
+commit 0cb54f06498fb85e3aa856e914057d107e1e5f3a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:12:57 2008 +1000
radeon: read back register between on gart flush
-commit 2629e781e8dfd10922f92ae4f36f6d8d1bcaf21f
+commit ce684df2a21e5dbe675c08042530315cf462e847
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:11:55 2008 +1000
@@ -1274,7 +1274,7 @@
We need a buffer zeroing function for before we have
accel running etc
-commit bb863cf157f152bf9c3c75ef52d3358f74810e50
+commit 32b266160e3b21663d123a35073ae2e75f83e71f
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:49:16 2008 +1000
@@ -1285,55 +1285,55 @@
Primarily for the move code when we get a buffer in VRAM, we don't need
to copy the contents just zero them.
-commit 45144d80175ae671e2867f70fab46e9f3815819d
+commit 40ef896350a072ff4337ebe40164500ae78fe203
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:39:07 2008 +1000
ati_pcigart: add memory barrier and volatile for table access
-commit df092768d49d784ecb67276550411a1c046ea5d4
+commit e5bfd4e2684a586a2c37f7212dd927cc1ad2825c
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:35:26 2008 +1000
drm: remove tlb flush logic from ttm
-commit 48e599681d7421efb102bf67d3ffb85de98909c9
+commit afbc88f1b1faf82e4468a41582f5edf20f325f8c
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:14:38 2008 +1000
radeon: add GTT domain
-commit bdfab3f0e5e60270faadb63b6b2b2b4ab927af7e
+commit d40d823a1aa4b0aace9472b48310608f2a88b4fc
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 14:58:05 2008 +1000
radeon: add missing regs from a previous rebase
-commit c2643a95fcd172f53b00d8a048c6e855f806c133
+commit d68ec620b5ce92cba076bcf36f10244a8eb61217
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 18:14:56 2008 +1000
disable modeset on < r300
-commit 03743ff14775ff8f571be33c3cdf14115e8eceae
+commit 090468f9eb7902b3b40aae33b4b106f57789f2bf
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 09:36:21 2008 +1000
radeon: set the base after mode is programmed
-commit ae7a56532e1472035f907c0acecae826fe853d2c
+commit 73b7fa46678b8d9f65aa18b0572d3b44eeb9155a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 09:35:55 2008 +1000
radeon: fix LVDS modes problem
-commit cb3888f2aab3f335a17a4da0e1669f5e8baec359
+commit 68ce2baf19cb49dd74c7edbc9fae04f93abddb33
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 18:06:31 2008 +1000
radeon: reserve 64k of VRAM for now for text mode so we don't trample it
-commit b6a7bbdfc75615cf75376303a63182d44c808dae
+commit 02aabd4e45959316146b0674986619168787fa5a
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:38:27 2008 +1000
@@ -1341,31 +1341,31 @@
This gets RN50 to initialise correctly
-commit 3230dce3c9d2fb5a2f8c2a83f450975f76740c67
+commit f1d5fc14e5eaab53b7ee302a639b3252ce92b666
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:37:25 2008 +1000
radeon: add copy/solid regs for rn50
-commit aabe2fff48d537ce5beb8cff5165dca4101b19b8
+commit 14e314cf110bfb87d07b392bed6ba538d933817f
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:59:47 2008 +1000
radeon: fill in and make use of more combios tables
-commit d0654741d455c4466a43ca5b258820e73f765209
+commit 415156ad47139ba10983fb3cb71e597dbb5f0698
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 09:59:31 2008 +1000
radeon: add quirks from DDX
-commit 3082e9106d61b8be1c4222f7dc0e425f779c01b1
+commit 56e20be83f5712041159dce5cf71e4d31fc8d19a
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:59:12 2008 +1000
radeon: fix warnings
-commit bd236f2de22f59b7c00474e9b2cdba6a42a140d4
+commit 741c535d30479d9c4d0e20f8694a317f5df7472e
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:58:47 2008 +1000
@@ -1376,31 +1376,31 @@
- add debugging for tracing calls
- fix pitch calculation
-commit 8f28bc535dc4c9c7ce675cec9ece6616e4cb402d
+commit 9bf427622773a43da69e50a319f94c4bb3c893b2
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:58:24 2008 +1000
radeon: set base in legacy crtc mode set
-commit 2aac7d2763a7f3f112df2f9942092c046cf80f59
+commit 34e9eacda4e4f5adf2be8cd6135bcc3a2bf01f55
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:55:06 2008 +1000
radeon: Convert COM BIOS to table offset lookup function
-commit fab2ca2fc0657328ee4a08a04e8f7e173a6f5439
+commit 101d47c59e928c276471b16ddc8856ca55a664ea
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:54:03 2008 +1000
radeon/cursor: Restructure cursor handling and add support for legacy cursors
-commit 431bb03668c1075ef877586ae2014c52265c9ad4
+commit 6abfeddc6e23a9c669a0b187acacaa275e3f3546
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:53:08 2008 +1000
radeon/atom: implement crtc lock
-commit 885eb36edc42c1bc2f734ac07465caa0a5908063
+commit fbf9721f1a4e9960b7e519f9e9690697a02240f6
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:50:15 2008 +1000
@@ -1409,7 +1409,7 @@
- Add gamma set for legacy chips
- Add 16 bpp gamma set
-commit b14d8294d72e709abb5508bc4f3a1ef9d4aa9dde
+commit 0fe784e57f17359027e25656be64c2a9e293c0bd
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:55 2008 +1000
@@ -1419,19 +1419,19 @@
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
-commit 2a2eba912557867ada33f18b01c9e568d5fe21a2
+commit 3bc44aabb010b88eebe5e6622c982b6bfd6e0ba9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:30 2008 +1000
radeon: Add legacy dac detect stubs
-commit 81320399c817e2c380d61cc47e33c2941f2713b9
+commit b698693017ecc8aaef0f67637aaa728f8ce02a85
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:12 2008 +1000
unify connector, i2c handling for atom and legacy
-commit b8be98822ed9e227862574035a337355af602e87
+commit 971f9d1d231a60d6d593f42056b456d5fa0eb6c2
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:48:50 2008 +1000
@@ -1439,25 +1439,25 @@
- removed save/init/restore chain with set functions
-commit 08c73750a6c4e7c9cd2001e5356f9a41c69df4e9
+commit 23e0bfdea120999884c2617f8a028559f3afd4e8
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:54:04 2008 +1000
FEDORA: radeon set gart buffers start
-commit 5a45731318a2ce1c5c837ebc6ed4f90adc560215
+commit c6d97ddbeeae48f8abb46798997bb35f995d5cf4
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:52:41 2008 +1000
radeon: command submission remove debug
-commit 5ca82fa7c0c1c37933758da571f7a49049f02f69
+commit 4f04fe01b4e2b2ae55f288d8d272a773853a9439
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:51:00 2008 +1000
radeon: use mm_enabled variable to denote memory manager running
-commit b346d7fd98f71b30ac260ddfd573e85232fb8cd3
+commit 5e92aa24f7ac9c57398958cb8ad2f64a67f2e533
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:19:05 2008 +1000
@@ -1465,19 +1465,19 @@
in the correct place in the drm so buffer swaps work again
-commit ae94f51427464934539adc74ba24d8a65bd956af
+commit 10c05f710394a36718859a57734f5eb619a2b86e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:18:08 2008 +1000
radeon: add mm supported call for userspace
-commit 87ce2d51fe9bf6b12d566acceb60e3c8e6ef3754
+commit ae2378eafefff6a957abf3df1c6b6c4e1ed61d6a
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 09:40:18 2008 +1000
FEDORA: add old DMA buffers on top of GEM
-commit 273fba23a75da935f37ea5a96dd0139e3794c917
+commit a8ecee1cb5b7c6372392e5cb8a36f5a94f84bd2c
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 15:57:10 2008 +1000
@@ -1486,61 +1486,61 @@
This adds the CRTC and PLL setting code, it doesn't work
yet but its all heading in the right direction.
-commit 62b6a15caddf40f7bf53d42c312637b9379301c8
+commit 4482e57fe49b2b8ec7ec465ce2ff18a6a97e3446
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 10:11:23 2008 +1000
radeon: add initial tmds parsing for legacy cards
-commit 821344e246fa73e802bda1739877bf5aca6b99ac
+commit c9c27573cb9ab32dbdd57dde98a78937349734f9
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 16:01:22 2008 +1000
radeon: set new memmap on gem enable
-commit f76d528fa4b9bda0384a0ecb2bbfbd129c1f7d89
+commit 75671783997804ac1caf7adc55a55288cebb5478
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:51:02 2008 +1000
radeon/pci: fixup table when GEM allocates it
-commit e2ee758f327971e46098c9bc9ce39a5d100892c7
+commit ea3ecd522f7c892f890d3f05e9e4d9afb756d2f3
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:38 2008 +1000
radeon: set gart table size
-commit 52aa63f3ce873308630e0045f61e240a179cf9c6
+commit 698a47061061987a3e0e14634396f3a8eed39eda
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:18 2008 +1000
radeon: fix buffer evict slection
-commit e556cbe8e4f0c0ff061b8590208628ad32002550
+commit 6c786fa6534e9a3c6271c663e64c5d604a599c53
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:43:51 2008 +1000
pcigart: fix incorrect memset + no need for wbinvd
-commit 5a9bf40c73e2dbff29cf2473b784f1cf9563f2f7
+commit f13913c1d96ca32eed091072ba6f718569ef12b7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 5 11:22:24 2008 +1000
radeon: fix defines so blit works again
-commit 31a1f633e91259b69828a58728357045bd7669f9
+commit 334994cc7a75261062a710ec63780ac36905a1c9
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 17:10:35 2008 +1000
drm: leave bo driver finish to the driver
-commit 8c087263ec8a2944a5cc30a933903c6c39436a51
+commit 82f61d695ed93b58a419e3eb5953976e541e6d1d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:21:22 2008 +1000
drm: fix unneeded debug
-commit e042198ac4304fb008d236cf2076f9e5793d6d47
+commit 41122f6d89bbcc4cc7e3a21dcaef7d1ef815e855
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:47 2008 +1000
@@ -1548,37 +1548,37 @@
if kms enabled memory manager will be enabled by default
-commit 37ef33584e98a4800bf15b31835b88084ece1d51
+commit 7a1ff9f84ab5ef9fde35a7d62a440a153299b89c
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:26 2008 +1000
drm: kill bo after driver lastclose
-commit 18fbb00c453c91f3e80d3925604ad0566d11c082
+commit 1a2c8780d86645219b4fd03cb2a52ac57e4dcbf3
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 11:32:45 2008 +1000
radeon: don't invalidate cache if CP isn't running
-commit 5521d206bb65bcf35e3d3da84cd46cb9280f8e60
+commit 99049dfaffca04e943c866419dfce930622b7132
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Aug 2 08:06:26 2008 +1000
drm: fix release locking
-commit 78044363260bd8adc8c31d5626121cb50fbca0cf
+commit 34d8e2c2135d82b927d8ebcc9ca8d1bcac970e8a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 16:55:34 2008 +1000
drm: add radeon modesetting support
-commit f9bb60a2d2b9f9d108f5197d19acf51b00cee104
+commit 875b0640669b76b59d585f67ad30801725b39df7
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:06:12 2008 +1000
drm: add TTM VM changes
-commit f22ee89b38cf4d6f7ac1f18fb837022ac303577d
+commit d812bcb383579b48a38309dec3418db1321e117b
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jul 31 15:27:27 2008 +1000
@@ -15127,7 +15127,7 @@
/* BEGIN: Vertex program instruction set */
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
-index 04fde35..8cc1542 100644
+index 76eb0d5..03d7b50 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -1720,7 +1720,7 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev,
@@ -21839,10 +21839,10 @@
+ drm_mode_config_cleanup(dev);
+}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 2cb4f32..fcb05a4 100644
+index 13a60f4..fcb05a4 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -35,42 +35,97 @@
+@@ -35,48 +35,97 @@
#include "radeon_drv.h"
#include "drm_pciids.h"
@@ -21859,6 +21859,8 @@
module_param_named(no_wb, radeon_no_wb, int, 0444);
-static int radeon_suspend(struct drm_device *dev, pm_message_t state)
+-{
+- drm_radeon_private_t *dev_priv = dev->dev_private;
+int radeon_modeset = -1;
+module_param_named(modeset, radeon_modeset, int, 0400);
+
@@ -21873,10 +21875,17 @@
+
+MODULE_PARM_DESC(vramzero, "Zero VRAM for new objects");
+module_param_named(vramzero, radeon_vram_zero, int, 0600);
-+
+
+- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+- return 0;
+MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32,64, etc)\n");
+module_param_named(gartsize, radeon_gart_size, int, 0600);
-+
+
+- /* Disable *all* interrupts */
+- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
+- RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
+- RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
+- return 0;
+static struct drm_driver driver;
+
+static struct pci_device_id pciidlist[] = {
@@ -21889,31 +21898,20 @@
+
+static int __devinit
+radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- {
-- drm_radeon_private_t *dev_priv = dev->dev_private;
-+ return drm_get_dev(pdev, ent, &driver);
-+}
-+
-+static void
-+radeon_pci_remove(struct pci_dev *pdev)
+{
-+ struct drm_device *dev = pci_get_drvdata(pdev);
-
-- /* Disable *all* interrupts */
-- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
-- RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
-- RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
-- return 0;
-+ drm_put_dev(dev);
++ return drm_get_dev(pdev, ent, &driver);
}
-static int radeon_resume(struct drm_device *dev)
-+static int
-+radeon_pci_suspend(struct pci_dev *pdev, pm_message_t state)
++static void
++radeon_pci_remove(struct pci_dev *pdev)
{
- drm_radeon_private_t *dev_priv = dev->dev_private;
+ struct drm_device *dev = pci_get_drvdata(pdev);
-+ return radeon_suspend(dev, state);
+
+- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+- return 0;
++ drm_put_dev(dev);
+}
- /* Restore interrupt registers */
@@ -21922,14 +21920,21 @@
- RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
- return 0;
+static int
-+radeon_pci_resume(struct pci_dev *pdev)
++radeon_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ struct drm_device *dev = pci_get_drvdata(pdev);
-+ return radeon_resume(dev);
++ return radeon_suspend(dev, state);
}
-static struct pci_device_id pciidlist[] = {
- radeon_PCI_IDS
++static int
++radeon_pci_resume(struct pci_dev *pdev)
++{
++ struct drm_device *dev = pci_get_drvdata(pdev);
++ return radeon_resume(dev);
++}
++
+
+extern struct drm_fence_driver radeon_fence_driver;
+
@@ -21957,7 +21962,7 @@
.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
.load = radeon_driver_load,
.firstopen = radeon_driver_firstopen,
-@@ -86,6 +141,10 @@ static struct drm_driver driver = {
+@@ -92,6 +141,10 @@ static struct drm_driver driver = {
.disable_vblank = radeon_disable_vblank,
.master_create = radeon_master_create,
.master_destroy = radeon_master_destroy,
@@ -21968,7 +21973,7 @@
.irq_preinstall = radeon_driver_irq_preinstall,
.irq_postinstall = radeon_driver_irq_postinstall,
.irq_uninstall = radeon_driver_irq_uninstall,
-@@ -94,7 +153,11 @@ static struct drm_driver driver = {
+@@ -100,7 +153,11 @@ static struct drm_driver driver = {
.get_map_ofs = drm_core_get_map_ofs,
.get_reg_ofs = drm_core_get_reg_ofs,
.ioctls = radeon_ioctls,
@@ -21980,7 +21985,7 @@
.fops = {
.owner = THIS_MODULE,
.open = drm_open,
-@@ -111,8 +174,15 @@ static struct drm_driver driver = {
+@@ -117,8 +174,15 @@ static struct drm_driver driver = {
.pci_driver = {
.name = DRIVER_NAME,
.id_table = pciidlist,
@@ -21996,7 +22001,7 @@
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
.date = DRIVER_DATE,
-@@ -124,6 +194,29 @@ static struct drm_driver driver = {
+@@ -130,6 +194,29 @@ static struct drm_driver driver = {
static int __init radeon_init(void)
{
driver.num_ioctls = radeon_max_ioctl;
drm-next.patch:
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.6.6.3
retrieving revision 1.6.6.4
diff -u -r1.6.6.3 -r1.6.6.4
--- drm-next.patch 12 Mar 2009 20:38:56 -0000 1.6.6.3
+++ drm-next.patch 17 Mar 2009 21:35:46 -0000 1.6.6.4
@@ -1,4 +1,32 @@
-commit 24011adb61c1510fdd9c7ec9a27fc1ac4b23f1bf
+commit 06f0a488c1b642d3cd7769da66600e5148c3fad8
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Mar 13 09:35:32 2009 +1000
+
+ drm/radeon: r600 ptes are 64-bit, cleanup cleanup function.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 03efb8853c35aff51c7b901bf412f32765fe0fd9
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Mar 10 18:36:38 2009 +1000
+
+ drm/radeon: don't call irq changes on r600 suspend/resume
+
+ Until we sort out r600 IRQs don't do this.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit d02f7fa77d97a28a4276939f35e44ae995ad13d7
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Mar 10 18:34:23 2009 +1000
+
+ drm/radeon: fix r600 writeback across suspend/resume
+
+ This update was done in mainline radeon, but not in the r600.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 6546bf6d6cbf1f9ac350fd278a1d937d4bb9ad06
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 15:31:20 2009 +1000
@@ -13,7 +41,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit d2d31c9fe72bf4904798fd0d01522644e49dd518
+commit 1847a549ac4db1272dea13d86331c492a2640b3b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 12:47:18 2009 +1000
@@ -24,7 +52,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 4ac16538732ad683c1e7c13cc569335a2db8b6c5
+commit 8f497aade8df2a619eacda927a43ebe82167a84c
Author: Hannes Eder <hannes at hanneseder.net>
Date: Thu Mar 5 20:14:18 2009 +0100
@@ -38,7 +66,7 @@
Signed-off-by: Hannes Eder <hannes at hanneseder.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ae0add29f05b2f5d22863eaefad106f2bb3919be
+commit a763d7dc0adb1159c1a52d43e566409da9fa59f0
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 12:17:08 2009 +1000
@@ -51,7 +79,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 9cc01249240abd94eeba0792ad6fc509e7bf072e
+commit 08932156cc2d4f8807dc5ca5c3d6ccd85080610a
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Sat Mar 7 18:21:21 2009 -0500
@@ -60,7 +88,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 8ebf7ff817d032d1f6a06da8b65149b3de049e14
+commit 53c379e9462b59d4e166429ff064aaf0e7743795
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 12:12:28 2009 +1000
@@ -70,7 +98,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 144a1136478cca4f3efe67787eec33ca07aec929
+commit 800b69951174f7de294da575d7e7921041a7e783
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Mar 6 11:47:54 2009 -0500
@@ -82,7 +110,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 664debb50231badbe84778f8945619e36555cd1d
+commit a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:15:24 2009 +1000
@@ -90,7 +118,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 34aa4615a2cce35e46ef23b298c90afe4903f85d
+commit eb1d91954ededc00ddcfb51e2626f114ff351524
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:14:40 2009 +1000
@@ -100,7 +128,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 840cd338857ead31f2c208f70cff2126b6838fd0
+commit 6abf66018f7fe231720e50f9a47b142182388869
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:13:47 2009 +1000
@@ -110,7 +138,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ae18cf3a76471e058613a5a1256969b8cfd27128
+commit 87f0da55353e23826a54bff57c457a13b97d18f1
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:12:10 2009 +1000
@@ -122,7 +150,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit c79813faebe755991896c699773f50851c670d4c
+commit 8ced9c75160947d2235fba75de9413e087e1171a
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Feb 25 17:02:19 2009 -0500
@@ -131,7 +159,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit a7f4943d120ba4c45cff2bd22883f598024a08dc
+commit c1556f71513f2e660fb2bbdc29344361b1ebff35
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Feb 25 16:57:49 2009 -0500
@@ -144,7 +172,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit b7fd19e6342c5f2522ec35dec0a92c8069813255
+commit 7659e9804b7a66047433182d86393d38ba4eff79
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Feb 25 15:55:01 2009 -0500
@@ -155,7 +183,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 393f865abfb61363ba117cb0c3ea5032bc0a3a3c
+commit 7335aafa30ecf39ede7f24bd2036dfbf4c25f269
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 17:13:42 2009 -0500
@@ -164,7 +192,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 6b3287c090c2c3eee993a96886f2f597c9e6ccfa
+commit c05ce0834a268f7d18274847190f6ed826b99332
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 16:22:29 2009 -0500
@@ -176,7 +204,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit e5a4f4a67d0e886b68ebb122b9282289bf9d6d7f
+commit 80b3334a4d5c163ab35c560a21d2cdc39bb5d3f8
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 14:28:34 2009 -0500
@@ -191,7 +219,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 0c9f2a4eb40612b22c4bb32b9fe9bcbb82c99e10
+commit befb73c2322923766df7e36b51f407dbdc047eab
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 14:02:13 2009 -0500
@@ -204,7 +232,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 3d802792f818036520ab805ded2904a749af4a48
+commit 995e37cafb90f104395e015a9836cc459df1fc39
Author: Owain G. Ainsworth <oga at openbsd.org>
Date: Fri Feb 20 08:30:19 2009 +0000
@@ -222,7 +250,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 088b364ce837e5b1fc8dd022bb5f98c8f3d96e3c
+commit 87ba7c663af0f34aa603a5bb448783a5ed64573f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Feb 11 14:26:38 2009 +0000
@@ -232,7 +260,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit b884af03178e5cd139c8f566090ce763fb9e3a2b
+commit 97d479e77b8621cc6e1cb06eabe5a73390c8149c
Author: Eric Anholt <eric at anholt.net>
Date: Tue Feb 17 23:53:41 2009 -0800
@@ -245,7 +273,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ceeb73a867fe64a1de124cd3e9d776e89944f940
+commit 30106f97a6029f94a8f13a1ace877c850cf5cd37
Author: Ben Gamari <bgamari at gmail.com>
Date: Tue Feb 17 20:08:51 2009 -0500
@@ -258,7 +286,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit b1645221d43bbfab70c5c5cfdc9e9733e380fca0
+commit 955b12def42e83287c1bdb1411d99451753c1391
Author: Ben Gamari <bgamari at gmail.com>
Date: Tue Feb 17 20:08:49 2009 -0500
@@ -278,7 +306,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit d4b25b68f700e27a09c0c5a372c6ee5c1ec45b8e
+commit dd8d7cb49e6e61da96ca44174b063081892c4dc6
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 20 13:28:59 2009 +1000
@@ -288,7 +316,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 0c37ea7ccc5dabc1cd53780ae4600c6d0644b9f3
+commit 4247ca942a16745da3d09c58996b276d02655a72
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 20 13:28:34 2009 +1000
@@ -301,7 +329,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit f7d0d89cc8da1e1ca489d5df3df68b00c0dd59d4
+commit cd00f95aff6b4cfeccb261fd4100cceb4f5270ea
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri Feb 6 16:46:27 2009 +1100
@@ -313,7 +341,7 @@
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit e22139bc821f295d25c0eddbeb65facf1f395458
+commit 09e40d65d0aa6680428143cda1a7bdc8846ee991
Author: David Miller <davem at davemloft.net>
Date: Wed Feb 18 01:35:21 2009 -0800
@@ -328,7 +356,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 85cee125f1756aeaa35e02db01987a0a4a5db909
+commit 958a6f8ccb1964adc3eec84cf401c5baeb4fbca0
Author: David Miller <davem at davemloft.net>
Date: Wed Feb 18 01:35:23 2009 -0800
@@ -344,7 +372,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 37d1de5730f78a682a19a47f83893e6116a65325
+commit f1a2a9b6189f9f5c27672d4d32fec9492c6486b2
Author: David Miller <davem at davemloft.net>
Date: Wed Feb 18 15:41:02 2009 -0800
@@ -382,7 +410,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ddaf8998790ba8d389859fa6420c7da38db91191
+commit d30333bbabb4a2cfad1f1a45c48a4e4d0065c1f6
Author: David Miller <davem at davemloft.net>
Date: Sun Feb 15 01:08:07 2009 -0800
@@ -400,7 +428,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 1a531c0b82db724bf802f5e100c2c2fc08d54459
+commit 6abf6bb0ff90bb77f9429bd0d90fc841c358daf3
Author: David Miller <davem at davemloft.net>
Date: Sat Feb 14 01:51:07 2009 -0800
@@ -422,7 +450,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 7c5627f23a200c4ab9563b0f1fcfc6984be6ce0b
+commit e8a894372b4ea05dc266ba7d7a7634315b6230e8
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:44 2009 -0800
@@ -434,7 +462,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 0a5bd3c5c690560a24886d25c5031291c0efbc35
+commit b266503072f824a82d585a6d41ebd591a2d7daa4
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:39 2009 -0800
@@ -446,7 +474,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 557d71764de798c60cc504f678aaf66a01374860
+commit b07fa022ecf1e04fd0623877affe9e10bf45ac86
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:37 2009 -0800
@@ -469,7 +497,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 2a2aba5d992576a6d73666be1e5ef0248b7a5c1b
+commit 296c6ae0e9b5ced1060b43a68b5f7e41a18509f6
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:34 2009 -0800
@@ -486,7 +514,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit f087a3713864f4d3bba746cb70aaebbf9ee1e13f
+commit 5a7aad9a559a5488cbef7aa3d4d96fc28220b8ae
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:27 2009 -0800
@@ -507,7 +535,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 928278d2dfc9e3d1af52dd037c13693add544501
+commit 8e1004580e0c862cb6bbe2ff8e496f846c54052f
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Jan 5 16:10:05 2009 -0500
@@ -526,7 +554,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 2c3a4c2e0f4127adbf9cecb473f2ac4576d289aa
+commit 112b715e8e2f9ef7b96930888bb099ce10b4c3cc
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Sun Jan 4 16:55:33 2009 -0500
@@ -540,7 +568,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 731b22a5b708f10e45847007a8d786568cb8becc
+commit 41c2e75e60200a860a74b7c84a6375c105e7437f
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Feb 2 16:55:47 2009 +1100
@@ -567,7 +595,7 @@
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 3365ed3f4b72d9eaecc7a67ff0f3078c9053806d
+commit f77d390c9779c496aa5b99ec832996fb76bb1d13
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Feb 2 16:55:46 2009 +1100
@@ -598,7 +626,7 @@
Acked-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 2d072cd331fb6434406977ac3bbe7a58589f5cca
+commit d883f7f1b75c8dcafa891f7b9e69c5a2f0ff6d66
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Feb 2 16:55:45 2009 +1100
@@ -3011,7 +3039,7 @@
intel_display.o \
intel_crt.o \
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 6dab63b..7fecc6d 100644
+index 6d21b9e..4d9f5c6 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1057,7 +1057,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
@@ -3100,10 +3128,10 @@
.name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 17fa408..3951a12 100644
+index d6cc986..1bc45a7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -599,8 +599,6 @@ int i915_gem_get_tiling(struct drm_device *dev, void *data,
+@@ -604,8 +604,6 @@ int i915_gem_get_tiling(struct drm_device *dev, void *data,
int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
void i915_gem_load(struct drm_device *dev);
@@ -3112,7 +3140,7 @@
int i915_gem_init_object(struct drm_gem_object *obj);
void i915_gem_free_object(struct drm_gem_object *obj);
int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);
-@@ -644,6 +642,10 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len,
+@@ -649,6 +647,10 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len,
const char *where, uint32_t mark);
void i915_dump_lru(struct drm_device *dev, const char *where);
@@ -3124,7 +3152,7 @@
extern int i915_save_state(struct drm_device *dev);
extern int i915_restore_state(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 85685bf..cb6493a 100644
+index 37427e4..8d5ec5f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -627,7 +627,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj)
@@ -3136,7 +3164,7 @@
int ret = 0;
/* Set the object up for mmap'ing */
-@@ -1868,7 +1868,6 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
+@@ -1913,7 +1913,6 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
static int
i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
{
@@ -3144,7 +3172,7 @@
int ret;
i915_gem_object_flush_gpu_write_domain(obj);
-@@ -1887,7 +1886,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
+@@ -1932,7 +1931,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
/* Flush the CPU cache if it's still invalid. */
if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) {
i915_gem_clflush_object(obj);
@@ -3152,7 +3180,7 @@
obj->read_domains |= I915_GEM_DOMAIN_CPU;
}
-@@ -2099,7 +2097,6 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
+@@ -2144,7 +2142,6 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
static void
i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
{
@@ -3160,7 +3188,7 @@
struct drm_i915_gem_object *obj_priv = obj->driver_private;
if (!obj_priv->page_cpu_valid)
-@@ -2115,7 +2112,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
+@@ -2160,7 +2157,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
continue;
drm_clflush_pages(obj_priv->page_list + i, 1);
}
@@ -3921,10 +3949,10 @@
cmdbuf->bufsz -= sizeof(u64);
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
new file mode 100644
-index 0000000..04fde35
+index 0000000..76eb0d5
--- /dev/null
+++ b/drivers/gpu/drm/radeon/r600_cp.c
-@@ -0,0 +1,2256 @@
+@@ -0,0 +1,2253 @@
+/*
+ * Copyright 2008-2009 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
@@ -4052,7 +4080,7 @@
+ return;
+
+ if (gart_info->bus_addr) {
-+ max_pages = (gart_info->table_size / sizeof(u32));
++ max_pages = (gart_info->table_size / sizeof(u64));
+ pages = (entry->pages <= max_pages)
+ ? entry->pages : max_pages;
+
@@ -5664,9 +5692,6 @@
+
+ RADEON_WRITE(R600_CP_DEBUG, (1 << 27) | (1 << 28));
+
-+ /* Start with assuming that writeback doesn't work */
-+ dev_priv->writeback_works = 0;
-+
+ /* Initialize the scratch register pointer. This will cause
+ * the scratch register values to be written out to memory
+ * whenever they are updated.
@@ -30298,10 +30323,10 @@
+ }
+}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index fef2078..2cb4f32 100644
+index fef2078..13a60f4 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -41,23 +41,12 @@ int radeon_no_wb;
+@@ -41,23 +41,15 @@ int radeon_no_wb;
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -30320,22 +30345,29 @@
{
drm_radeon_private_t *dev_priv = dev->dev_private;
++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
++ return 0;
++
/* Disable *all* interrupts */
- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
return 0;
-@@ -68,7 +57,7 @@ static int radeon_resume(struct drm_device *dev)
+@@ -67,8 +59,11 @@ static int radeon_resume(struct drm_device *dev)
+ {
drm_radeon_private_t *dev_priv = dev->dev_private;
++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
++ return 0;
++
/* Restore interrupt registers */
- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
return 0;
-@@ -95,7 +84,6 @@ static struct drm_driver driver = {
+@@ -95,7 +90,6 @@ static struct drm_driver driver = {
.get_vblank_counter = radeon_get_vblank_counter,
.enable_vblank = radeon_enable_vblank,
.disable_vblank = radeon_disable_vblank,
drm-nouveau.patch:
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.3
retrieving revision 1.8.6.4
diff -u -r1.8.6.3 -r1.8.6.4
--- drm-nouveau.patch 12 Mar 2009 20:38:56 -0000 1.8.6.3
+++ drm-nouveau.patch 17 Mar 2009 21:35:46 -0000 1.8.6.4
@@ -102,6 +102,89 @@
if (mask & ~fence->type) {
DRM_ERROR("Wait trying to extend fence type"
+diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
+index c1173d8..2e4e667 100644
+--- a/drivers/gpu/drm/drm_gem.c
++++ b/drivers/gpu/drm/drm_gem.c
+@@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
+ * is freed, the name goes away.
+ */
+ int
+-drm_gem_flink_ioctl(struct drm_device *dev, void *data,
+- struct drm_file *file_priv)
++drm_gem_object_name(struct drm_device *dev, struct drm_gem_object *obj,
++ uint64_t *name)
+ {
+- struct drm_gem_flink *args = data;
+- struct drm_gem_object *obj;
+ int ret;
+
+- if (!(dev->driver->driver_features & DRIVER_GEM))
+- return -ENODEV;
+-
+- obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+- if (obj == NULL)
+- return -EBADF;
+-
+ again:
+- if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {
+- ret = -ENOMEM;
+- goto err;
+- }
++ if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0)
++ return -ENOMEM;
+
+ spin_lock(&dev->object_name_lock);
+ if (!obj->name) {
+ ret = idr_get_new_above(&dev->object_name_idr, obj, 1,
+ &obj->name);
+- args->name = (uint64_t) obj->name;
++ *name = (uint64_t) obj->name;
+ spin_unlock(&dev->object_name_lock);
+
+ if (ret == -EAGAIN)
+ goto again;
+
+ if (ret != 0)
+- goto err;
++ return ret;
+
+ /* Allocate a reference for the name table. */
+ drm_gem_object_reference(obj);
+ } else {
+- args->name = (uint64_t) obj->name;
++ *name = (uint64_t) obj->name;
+ spin_unlock(&dev->object_name_lock);
+- ret = 0;
+ }
+
+-err:
++ return 0;
++}
++EXPORT_SYMBOL(drm_gem_object_name);
++
++int
++drm_gem_flink_ioctl(struct drm_device *dev, void *data,
++ struct drm_file *file_priv)
++{
++ struct drm_gem_flink *args = data;
++ struct drm_gem_object *obj;
++ uint64_t name;
++ int ret;
++
++ if (!(dev->driver->driver_features & DRIVER_GEM))
++ return -ENODEV;
++
++ obj = drm_gem_object_lookup(dev, file_priv, args->handle);
++ if (obj == NULL)
++ return -EBADF;
++
++ ret = drm_gem_object_name(dev, obj, &name);
++ args->name = name;
++
+ mutex_lock(&dev->struct_mutex);
+ drm_gem_object_unreference(obj);
+ mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 5d45cbf..e3b0a76 100644
--- a/drivers/gpu/drm/drm_stub.c
@@ -2529,10 +2612,10 @@
+MODULE_LICENSE("GPL and additional rights");
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
new file mode 100644
-index 0000000..06e3f9e
+index 0000000..c281440
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,741 @@
+@@ -0,0 +1,746 @@
+/*
+ * Copyright 2005 Stephane Marchesin.
+ * All Rights Reserved.
@@ -2903,6 +2986,11 @@
+ struct mutex submit_mutex;
+
+ struct backlight_device *backlight;
++
++ struct drm_gem_object *sfb_gem;
++ struct mem_block *sfb;
++ uint64_t sfbhack_handle;
++ uint64_t sfbhack_size;
+};
+
+#define NOUVEAU_CHECK_INITIALISED_WITH_RETURN do { \
@@ -10321,10 +10409,10 @@
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
new file mode 100644
-index 0000000..756141a
+index 0000000..2988664
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,943 @@
+@@ -0,0 +1,1038 @@
+/*
+ * Copyright 2005 Stephane Marchesin
+ * Copyright 2008 Stuart Bennett
@@ -10363,6 +10451,84 @@
+static int nouveau_stub_init(struct drm_device *dev) { return 0; }
+static void nouveau_stub_takedown(struct drm_device *dev) {}
+
++extern int drm_gem_object_name(struct drm_device *, struct drm_gem_object *,
++ uint64_t *);
++static int
++sfbhack_init(struct drm_device *dev)
++{
++ struct drm_nouveau_private *dev_priv = dev->dev_private;
++ uint32_t flags;
++ int ret, size;
++
++ if (dev_priv->sfb_gem || dev_priv->sfb)
++ return 0;
++
++ size = nouveau_mem_fb_amount(dev);
++ if (size > drm_get_resource_len(dev, 1))
++ size = drm_get_resource_len(dev, 1);
++ size >>= 1;
++
++ if (dev_priv->mm_enabled) {
++ flags = NOUVEAU_GEM_DOMAIN_VRAM;
++ if (dev_priv->card_type == NV_50)
++ flags |= NOUVEAU_GEM_DOMAIN_TILE;
++
++ ret = nouveau_gem_new(dev, dev_priv->channel, size, 0,
++ flags, &dev_priv->sfb_gem);
++ if (ret)
++ return ret;
++
++ ret = nouveau_gem_pin(dev_priv->sfb_gem,
++ NOUVEAU_GEM_DOMAIN_VRAM);
++ if (ret)
++ return ret;
++
++ ret = drm_gem_object_name(dev, dev_priv->sfb_gem,
++ &dev_priv->sfbhack_handle);
++ if (ret) {
++ mutex_lock(&dev->struct_mutex);
++ drm_gem_object_unreference(dev_priv->sfb_gem);
++ mutex_unlock(&dev->struct_mutex);
++ dev_priv->sfb_gem = NULL;
++ }
++
++ dev_priv->sfbhack_size = dev_priv->sfb_gem->size;
++ return 0;
++ }
++
++ flags = NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED;
++ if (dev_priv->card_type == NV_50)
++ flags |= NOUVEAU_MEM_TILE;
++
++ dev_priv->sfb = nouveau_mem_alloc(dev, 0, size, flags,
++ (struct drm_file *)-2);
++ if (!dev_priv->sfb)
++ return -ENOMEM;
++
++ dev_priv->sfbhack_handle = ((u64)dev_priv->sfb->map_handle << 32 |
++ dev_priv->sfb->start);
++ dev_priv->sfbhack_size = dev_priv->sfb->size;
++ return 0;
++}
++
++static void
++sfbhack_takedown(struct drm_device *dev)
++{
++ struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++ if (dev_priv->sfb_gem) {
++ mutex_lock(&dev->struct_mutex);
++ drm_gem_object_unreference(dev_priv->sfb_gem);
++ mutex_unlock(&dev->struct_mutex);
++ dev_priv->sfb_gem = NULL;
++ }
++
++ if (dev_priv->sfb) {
++ nouveau_mem_free(dev, dev_priv->sfb);
++ dev_priv->sfb = NULL;
++ }
++}
++
+static int nouveau_init_engine_ptrs(struct drm_device *dev)
+{
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -10936,6 +11102,8 @@
+/* KMS: we need mmio at load time, not when the first drm client opens. */
+void nouveau_lastclose(struct drm_device *dev)
+{
++ sfbhack_takedown(dev);
++
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
+ return;
+
@@ -10970,6 +11138,7 @@
+{
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ struct drm_nouveau_getparam *getparam = data;
++ int ret;
+
+ NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
+
@@ -11018,6 +11187,20 @@
+ case NOUVEAU_GETPARAM_VM_VRAM_BASE:
+ getparam->value = dev_priv->vm_vram_base;
+ break;
++ case 0xdeadcafe00000001: /* NOUVEAU_GETPARAM_SHAREDFB_HANDLE */
++ ret = sfbhack_init(dev);
++ if (ret)
++ return ret;
++
++ getparam->value = dev_priv->sfbhack_handle;
++ break;
++ case 0xdeadcafe00000002: /* NOUVEAU_GETPARAM_SHAREDFB_SIZE */
++ ret = sfbhack_init(dev);
++ if (ret)
++ return ret;
++
++ getparam->value = dev_priv->sfbhack_size;
++ break;
+ default:
+ DRM_ERROR("unknown parameter %lld\n", getparam->param);
+ return -EINVAL;
@@ -42765,7 +42948,7 @@
unifdef-y += via_drm.h
+unifdef-y += nouveau_drm.h
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 99e348d..e57c98f 100644
+index b61b0c6..5b7ce2d 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.11
retrieving revision 1.1294.2.12
diff -u -r1.1294.2.11 -r1.1294.2.12
--- kernel.spec 12 Mar 2009 20:38:57 -0000 1.1294.2.11
+++ kernel.spec 17 Mar 2009 21:35:47 -0000 1.1294.2.12
@@ -56,9 +56,9 @@
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 7
+%define rcrev 8
# The git snapshot level
-%define gitrev 5
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -582,9 +582,6 @@
# ppc64 goes kerspalt with .eh_frame
Patch06: build-with-fno-dwarf2-cfi-asm.patch
-# glibc-headers 2.9.90-10 changes default _POSIX_C_SOURCE
-Patch07: unifdef-rename-getline-symbol.patch
-
%if !%{nopatches}
# revert upstream patches we get via other methods
@@ -630,6 +627,10 @@
Patch452: linux-2.6-input-hid-extra-gamepad.patch
Patch460: linux-2.6-serial-460800.patch
+
+# 8192 too low
+Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
+
Patch510: linux-2.6-silence-noise.patch
Patch530: linux-2.6-silence-fbcon-logo.patch
Patch570: linux-2.6-selinux-mprotect-checks.patch
@@ -664,7 +665,9 @@
Patch2000: linux-2.6-e1000-ich9.patch
# Fix DEBUG_SHIRQ problem in tulip driver. (454575)
-Patch2030: linux-2.6-net-tulip-interrupt.patch
+Patch2001: linux-2.6-net-tulip-interrupt.patch
+# Fix DMA alloc bug in velocity
+Patch2002: linux-2.6-net-velocity-dma.patch
# linux1394 git patches
Patch2200: linux-2.6-firewire-git-update.patch
@@ -676,23 +679,20 @@
Patch2897: linux-2.6-hdpvr.patch
-# Updates/Fixes on V4L/DVB to the latest development tree
-# hdpvr is patching a function that were removed on linux-next
-Patch2898: linux-2.6-hdpvr-fix.patch
-
Patch2899: linux-2.6-v4l-dvb-fixes.patch
Patch2900: linux-2.6-v4l-dvb-update.patch
+Patch2901: linux-2.6-v4l-dvb-experimental.patch
-# ext4 fixes
+# fs fixes
Patch2910: linux-2.6-ext4-extent-header-check-fix.patch
-Patch2911: linux-2.6-ext4-flush-on-close.patch
+Patch2911: linux-2.6-ext4-print-warning-once.patch
+Patch2920: linux-2.6-ext4-flush-on-close.patch
+Patch3000: linux-2.6-btrfs-experimental-branch.patch
Patch9001: revert-fix-modules_install-via-nfs.patch
Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
-Patch9003: squashfs-fix-page-aligned-data.patch
-
Patch9997: xen.pvops.pre.patch
Patch9998: xen.pvops.patch
Patch9999: xen.pvops.post.patch
@@ -1044,8 +1044,6 @@
ApplyPatch build-with-fno-dwarf2-cfi-asm.patch
-ApplyPatch unifdef-rename-getline-symbol.patch
-
#
# misc small stuff to make things compile
#
@@ -1111,11 +1109,14 @@
# ext4
ApplyPatch linux-2.6-ext4-extent-header-check-fix.patch
+ApplyPatch linux-2.6-ext4-print-warning-once.patch
+
ApplyPatch linux-2.6-ext4-flush-on-close.patch
# xfs
# btrfs
+ApplyPatch linux-2.6-btrfs-experimental-branch.patch
# USB
@@ -1166,6 +1167,9 @@
# Allow to use 480600 baud on 16C950 UARTs
ApplyPatch linux-2.6-serial-460800.patch
+
+ApplyPatch increase-MAX_LOCKDEP_ENTRIES.patch
+
# Silence some useless messages that still get printed with 'quiet'
ApplyPatch linux-2.6-silence-noise.patch
@@ -1197,8 +1201,6 @@
ApplyPatch linux-2.6.29-lirc.patch
# http://hg.jannau.net/hdpvr/
ApplyPatch linux-2.6-hdpvr.patch
-# Revert a change on v4l2-common on a function that will be removed by V4L/DVB patches
-ApplyPatch linux-2.6-hdpvr-fix.patch
# Fix the return code CD accesses when the CDROM drive door is closed
# but the drive isn't yet ready.
@@ -1207,6 +1209,7 @@
ApplyPatch linux-2.6-e1000-ich9.patch
ApplyPatch linux-2.6-net-tulip-interrupt.patch
+ApplyPatch linux-2.6-net-velocity-dma.patch
ApplyPatch agp-set_memory_ucwb.patch
# Nouveau DRM + drm fixes
@@ -1229,17 +1232,16 @@
# silence the ACPI blacklist code
ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-# V4L/DVB updates/fixes
+# V4L/DVB updates/fixes/experimental drivers
ApplyPatch linux-2.6-v4l-dvb-fixes.patch
ApplyPatch linux-2.6-v4l-dvb-update.patch
+ApplyPatch linux-2.6-v4l-dvb-experimental.patch
# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
ApplyPatch revert-fix-modules_install-via-nfs.patch
ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
-ApplyPatch squashfs-fix-page-aligned-data.patch
-
ApplyPatch xen.pvops.pre.patch
ApplyPatch xen.pvops.patch
ApplyPatch xen.pvops.post.patch
@@ -1826,6 +1828,46 @@
# and build.
%changelog
+* Tue Mar 17 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch
+
+* Tue Mar 17 2009 Kyle McMartin <kyle at redhat.com>
+- increase MAX_LOCKDEP_ENTRIES to 10240.
+
+* Mon Mar 16 2009 Josef Bacik <josef at toxicpanda.com> 2.6.29-0.258.rc8.git2
+- update btrfs code so it doesn't pop the stack on x86
+
+* Mon Mar 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.255.rc8.git2
+- 2.6.29-rc8-git2
+
+* Sun Mar 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.254.rc8.git1
+- 2.6.29-rc8-git1
+- Entire v4l-dvb-fixes patch was merged upstream.
+
+* Fri Mar 13 2009 Mauro Carvalho Chehab <mchehab at redhat.com
+- v4l-dvb patches: better conflict solving with hdpvr, more fixes and updates
+
+* Fri Mar 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.252.rc8
+- Quiet down an ext4 warning message.
+
+* Fri Mar 13 2009 Dave Jones <davej at redhat.com> 2.6.29-0.250.rc8
+- Fix DMA leak in Velocity TX path
+
+* Fri Mar 13 2009 Mauro Carvalho Chehab <mchehab at redhat.com
+- v4l-dvb patches: Add experimental cx231xx, plus more fixes and updates
+
+* Fri Mar 13 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: support needed for multiple xservers
+
+* Fri Mar 13 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.247.rc8
+- Linux 2.6.29-rc8
+- squashfs-fix-page-aligned-data.patch: upstream-ish
+- unifdef-rename-getline-symbol.patch: upstream-ish
+
+* Thu Mar 12 2009 Dave Airlie <airlied at redhat.com>
+- drm-next.patch: r600 fixes for suspend/resume
+- drm-modesetting-radeon.patch: rebase on drm-next
+
* Thu Mar 12 2009 Michael Young <m.a.young at durham.ac.uk>
- update pvops patch which includes /sys/hypervisor support
linux-2.6-v4l-dvb-fixes.patch:
Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.2.8.3
retrieving revision 1.2.8.4
diff -u -r1.2.8.3 -r1.2.8.4
--- linux-2.6-v4l-dvb-fixes.patch 12 Mar 2009 20:38:58 -0000 1.2.8.3
+++ linux-2.6-v4l-dvb-fixes.patch 17 Mar 2009 21:35:48 -0000 1.2.8.4
@@ -1,51 +0,0 @@
-Gregory Lardiere (1):
- V4L/DVB (10789): m5602-s5k4aa: Split up the initial sensor probe in chunks.
-
-Mauro Carvalho Chehab (1):
- V4L/DVB (10834): zoran: auto-select bt866 for AverMedia 6 Eyes
-
-Vitaly Wool (1):
- V4L/DVB (10832): tvaudio: Avoid breakage with tda9874a
-
-diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
-index e564a61..48892b5 100644
---- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
-+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
-@@ -102,7 +102,11 @@ int s5k4aa_probe(struct sd *sd)
- }
-
- /* Test some registers, but we don't know their exact meaning yet */
-- if (m5602_read_sensor(sd, 0x00, prod_id, sizeof(prod_id)))
-+ if (m5602_read_sensor(sd, 0x00, prod_id, 2))
-+ return -ENODEV;
-+ if (m5602_read_sensor(sd, 0x02, prod_id+2, 2))
-+ return -ENODEV;
-+ if (m5602_read_sensor(sd, 0x04, prod_id+4, 2))
- return -ENODEV;
-
- if (memcmp(prod_id, expected_prod_id, sizeof(prod_id)))
-diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
-index 5aeccb3..076ed5b 100644
---- a/drivers/media/video/tvaudio.c
-+++ b/drivers/media/video/tvaudio.c
-@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL");
- /* ---------------------------------------------------------------------- */
- /* our structs */
-
--#define MAXREGS 64
-+#define MAXREGS 256
-
- struct CHIPSTATE;
- typedef int (*getvalue)(int);
-diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig
-index 4ea5fa7..8666e19 100644
---- a/drivers/media/video/zoran/Kconfig
-+++ b/drivers/media/video/zoran/Kconfig
-@@ -68,6 +68,7 @@ config VIDEO_ZORAN_AVS6EYES
- tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
- depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
- select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
-+ select VIDEO_BT866 if VIDEO_HELPER_CHIPS_AUTO
- select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
- help
- Support for the AverMedia 6 Eyes video surveillance card.
linux-2.6-v4l-dvb-update.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1.2.5 -r 1.1.2.6 linux-2.6-v4l-dvb-update.patch
Index: linux-2.6-v4l-dvb-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- linux-2.6-v4l-dvb-update.patch 12 Mar 2009 20:38:58 -0000 1.1.2.5
+++ linux-2.6-v4l-dvb-update.patch 17 Mar 2009 21:35:48 -0000 1.1.2.6
@@ -7,7 +7,7 @@
V4L/DVB (10639): gspca - sq905: New subdriver.
V4L/DVB (10829): Support alternate resolutions for sq905
-Alexey Klimov (16):
+Alexey Klimov (18):
V4L/DVB (10316): v4l/dvb: use usb_make_path in usb-radio drivers
V4L/DVB (10324): em28xx: Correct mailing list
V4L/DVB (10335): gspca - all subdrivers: Fix CodingStyle in sd_mod_init function.
@@ -24,6 +24,8 @@
V4L/DVB (10464): radio-si470x: use usb_make_path in usb-radio drivers
V4L/DVB (10465): dsbr100: Add few lost mutex locks.
V4L/DVB (10522): em28xx-audio: replace printk with em28xx_errdev
+ V4L/DVB (10946): radio-rtrack2: fix double mutex_unlock
+ V4L/DVB (10961): radio-terratec: remove linux/delay.h which hadn't been used.
Andy Walls (40):
V4L/DVB (10274): cx18: Fix a PLL divisor update for the I2S master clock
@@ -113,14 +115,18 @@
Erik S. Beiser (1):
V4L/DVB (10826): cx88: Add IR support to pcHDTV HD3000 & HD5500
-Guennadi Liakhovetski (5):
+Guennadi Liakhovetski (9):
V4L/DVB (10665): soc-camera: add data signal polarity flags to drivers
V4L/DVB (10672): sh_mobile_ceu_camera: include NV* formats into the format list only once.
V4L/DVB (10673): mt9t031: fix gain and hflip controls, register update, and scaling
V4L/DVB (10674): soc-camera: camera host driver for i.MX3x SoCs
V4L/DVB (10675): soc-camera: extend soc_camera_bus_param_compatible with more tests
+ V4L/DVB (11024): soc-camera: separate S_FMT and S_CROP operations
+ V4L/DVB (11025): soc-camera: configure drivers with a default format on open
+ V4L/DVB (11026): sh-mobile-ceu-camera: set field to the value, configured at open()
+ V4L/DVB (11027): soc-camera: configure drivers with a default format at probe time
-Hans Verkuil (107):
+Hans Verkuil (124):
V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support
V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy
V4L/DVB (10246): saa6752hs: convert to v4l2_subdev.
@@ -228,6 +234,23 @@
V4L/DVB (10892): radio-typhoon: convert to v4l2_device.
V4L/DVB (10893): radio-zoltrix: convert to v4l2_device.
V4L/DVB (10894): ISA radio drivers: improve kernel log message
+ V4L/DVB (10909): tvmixer: remove last remaining references to this deleted module.
+ V4L/DVB (10910): videodev2.h: remove deprecated VIDIOC_G_CHIP_IDENT_OLD
+ V4L/DVB (10912): vivi: fix compile warning.
+ V4L/DVB (10914): v4l2: fix compile warnings when printing u64 value.
+ V4L/DVB (10919): tlv320aic23b: use v4l2-i2c-drv.h instead of drv-legacy.h
+ V4L/DVB (10920): v4l2-ioctl: fix partial-copy code.
+ V4L/DVB (10921): msp3400: remove obsolete V4L1 code
+ V4L/DVB (10959): radio: remove uaccess include
+ V4L/DVB (10960): omap24xxcam: don't set vfl_type.
+ V4L/DVB (10962): fired-avc: fix printk formatting warning.
+ V4L/DVB (10965): ivtv: bump version
+ V4L/DVB (10980): doc: improve the v4l2-framework documentation.
+ V4L/DVB (10983): v4l2-common: add missing i2c_unregister_device.
+ V4L/DVB (10987): cx23885: fix crash on non-netup cards
+ V4L/DVB (10988): v4l2-dev: use parent field if the v4l2_device has no parent set.
+ V4L/DVB (11021): v4l2-device: add a notify callback.
+ V4L/DVB (11022): zoran/bt819: use new notify functionality.
Hans Werner (1):
V4L/DVB (10392): lnbp21: documentation about the system register
@@ -256,8 +279,14 @@
Jan Engelhardt (1):
V4L/DVB (10391): dvb: constify VFTs
-Jean Delvare (1):
+Jean Delvare (7):
V4L/DVB (10867): vino: fold i2c-algo-sgi code into vino.
+ V4L/DVB (10931): zoran: Drop the lock_norm module parameter
+ V4L/DVB (10932): zoran: Don't frighten users with failed buffer allocation
+ V4L/DVB (10938): em28xx: Prevent general protection fault on rmmod
+ V4L/DVB (10939): ir-kbd-i2c: Prevent general protection fault on rmmod
+ V4L/DVB (10940): saa6588: Prevent general protection fault on rmmod
+ V4L/DVB (10943): cx88: Prevent general protection fault on rmmod
Jean-Francois Moine (58):
V4L/DVB (10332): gspca - main: Version change.
@@ -329,7 +358,7 @@
Kay Sievers (1):
V4L/DVB (10395): struct device - replace bus_id with dev_name(), dev_set_name()
-Kuninori Morimoto (7):
+Kuninori Morimoto (8):
V4L/DVB (10616): tw9910: color format check is added on set_fmt
V4L/DVB (10666): ov772x: move configuration from start_capture() to set_fmt()
V4L/DVB (10667): ov772x: setting method to register is changed.
@@ -337,6 +366,7 @@
V4L/DVB (10669): ov772x: Add image flip support
V4L/DVB (10670): tw9910: bit mask operation fix on tw9910_mask_set.
V4L/DVB (10671): sh_mobile_ceu: SOCAM flags are not platform dependent
+ V4L/DVB (11028): ov772x: use soft sleep mode in stop_capture
Kyle Guinn (3):
V4L/DVB (10365): Add Mars-Semi MR97310A format
@@ -355,15 +385,20 @@
Lierdakil (1):
V4L/DVB (10388): gspca - pac207: Webcam 093a:2474 added.
-Magnus Damm (1):
+Magnus Damm (2):
V4L/DVB (10304): buf-dma-contig: fix USERPTR free handling
+ V4L/DVB (11029): video: use videobuf_waiton() in sh_mobile_ceu free_buffer()
-Matthias Schwarzott (3):
+Martin Fuzzey (1):
+ V4L/DVB (10945): pwc : fix LED and power setup for first open
+
+Matthias Schwarzott (4):
V4L/DVB (10662): remove redundant memset after kzalloc
V4L/DVB (10822): Add support for Zarlink ZL10036 DVB-S tuner.
V4L/DVB (10823): saa7134: add DVB support for Avermedia A700 cards
+ V4L/DVB (10948): flexcop-pci: Print a message in case the new stream watchdog detects a problem
-Mauro Carvalho Chehab (36):
+Mauro Carvalho Chehab (38):
V4L/DVB (10211): vivi: Implements 4 inputs on vivi
V4L/DVB (10298): remove err macro from few usb devices
V4L/DVB (10305): videobuf-vmalloc: Fix: videobuf memory were never freed
@@ -399,9 +434,11 @@
V4L/DVB (10897): Fix Kbuild MEDIA_TUNER_CUSTOMIZE dependencies
V4L/DVB (10870a): remove all references for video_decoder.h
V4L/DVB (10907): avoid loading the entire videodev.h header on V4L2 drivers
- Merge branch 'next' of ../devel
+ V4L/DVB (10951): xc5000: Fix CodingStyle errors introduced by the last patch
+ V4L/DVB (10908): videobuf-core: also needs a minimal subset of V4L1 header
+ Merge branch 'next' of ../devel into Fedora
-Michael Krufky (26):
+Michael Krufky (35):
V4L/DVB (10415): dib0700: add data debug to dib0700_i2c_xfer_new
V4L/DVB (10416): tveeprom: update to include Hauppauge tuners 151-155
V4L/DVB (10417): sms1xxx: add missing usb id 2040:2011
@@ -428,6 +465,15 @@
V4L/DVB (10903): cleanup linewraps in dib3000mc.h
V4L/DVB (10904): remove dib0070_ctrl_agc_filter from dib0070.h
V4L/DVB (10905): dib0700: enable DVB_FE_CUSTOMISE for dibcom frontends
+ V4L/DVB (10923): saa7134: fix typo in product name
+ V4L/DVB (10924): saa7134: enable serial transport streaming interface
+ V4L/DVB (10925): add support for LG Electronics LGDT3305 ATSC/QAM-B Demodulator
+ V4L/DVB (10926): saa7134: enable digital tv support for Hauppauge WinTV-HVR1120
+ V4L/DVB (10927): dib0700: add support for Hauppauge ATSC MiniCard
+ V4L/DVB (10968): lgdt3305: add email address to MODULE_AUTHOR
+ V4L/DVB (10969): lgdt3305: add missing space in comment
+ V4L/DVB (10970): lgdt3305: add MODULE_VERSION
+ V4L/DVB (10984): lgdt3305: avoid OOPS in error path of lgdt3305_attach
Mike Isely (7):
V4L/DVB (10236): pvrusb2: Stop advertising VBI capability - it isn't there
@@ -457,6 +503,9 @@
Pascal Terjan (1):
V4L/DVB (10825): Add ids for Yuan PD378S DVB adapter
+Philippe Rétornaz (1):
+ V4L/DVB (11035): mt9t031 bugfix
+
Randy Dunlap (3):
V4L/DVB (10631): zoran: fix printk format
V4L/DVB (10830): dm1105: uses ir_* functions, select VIDEO_IR
@@ -467,17 +516,39 @@
V4L/DVB (10518): em28xx: Fix for em28xx memory leak and function rename
V4L/DVB (10519): em28xx: Fix for em28xx audio startup
+Robert Millan (1):
+ V4L/DVB (10944): Conceptronic CTVFMI2 PCI Id
+
Roel Kluin (3):
V4L/DVB (10629): tvp514x: try_count reaches 0, not -1
V4L/DVB: calibration still successful at 10
V4L/DVB (10657): [PATCH] V4L: missing parentheses?
+Sascha Hauer (5):
+ V4L/DVB (11030): soc-camera: add board hook to specify the buswidth for camera sensors
+ V4L/DVB (11031): pcm990 baseboard: add camera bus width switch setting
+ V4L/DVB (11032): mt9m001: allow setting of bus width from board code
+ V4L/DVB (11033): mt9v022: allow setting of bus width from board code
+ V4L/DVB (11034): soc-camera: remove now unused gpio member of struct soc_camera_link
+
+Scott James Remnant (1):
+ V4L/DVB (10947): Auto-load videodev module when device opened.
+
Sebastian Andrzej Siewior (1):
V4L/DVB (10655): tvp514x: make the module aware of rich people
Sergio Aguirre (1):
V4L/DVB (10575): V4L2: Add COLORFX user control
+Sri Deevi (1):
+ V4L/DVB (10950): xc5000: prepare it to be used by cx231xx module
+
+Stephan Wienczny (1):
[...15060 lines suppressed...]
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++#ifndef _BT819_H_
++#define _BT819_H_
++
++#include <linux/ioctl.h>
++
++/* v4l2_device notifications. */
++
++/* Needed to reset the FIFO buffer when changing the input
++ or the video standard. */
++#define BT819_FIFO_RESET_LOW _IO('b', 0)
++#define BT819_FIFO_RESET_HIGH _IO('b', 1)
++
++#endif
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h
index 9ec4d58..9ebe855 100644
--- a/include/media/cx2341x.h
@@ -81048,6 +86668,20 @@
#endif
/*
+diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
+index 00fa57e..07963d7 100644
+--- a/include/media/ir-kbd-i2c.h
++++ b/include/media/ir-kbd-i2c.h
+@@ -14,8 +14,7 @@ struct IR_i2c {
+ /* Used to avoid fast repeating */
+ unsigned char old;
+
+- struct work_struct work;
+- struct timer_list timer;
++ struct delayed_work work;
+ char phys[32];
+ int (*get_key)(struct IR_i2c*, u32*, u32*);
+ };
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index e391d55..57db48d 100644
--- a/include/media/ov772x.h
@@ -81160,10 +86794,59 @@
#endif /* __ASM_SH_MOBILE_CEU_H__ */
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
-index 7440d92..c63a340 100644
+index 7440d92..3701368 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
-@@ -239,15 +239,19 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
+@@ -45,6 +45,7 @@ struct soc_camera_device {
+ int num_formats;
+ struct soc_camera_format_xlate *user_formats;
+ int num_user_formats;
++ enum v4l2_field field; /* Preserve field over close() */
+ struct module *owner;
+ void *host_priv; /* Per-device host private data */
+ /* soc_camera.c private count. Only accessed with .video_lock held */
+@@ -74,7 +75,8 @@ struct soc_camera_host_ops {
+ int (*resume)(struct soc_camera_device *);
+ int (*get_formats)(struct soc_camera_device *, int,
+ struct soc_camera_format_xlate *);
+- int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *);
++ int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
++ int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
+ int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
+ void (*init_videobuf)(struct videobuf_queue *,
+ struct soc_camera_device *);
+@@ -93,13 +95,18 @@ struct soc_camera_host_ops {
+ struct soc_camera_link {
+ /* Camera bus id, used to match a camera and a bus */
+ int bus_id;
+- /* GPIO number to switch between 8 and 10 bit modes */
+- unsigned int gpio;
+ /* Per camera SOCAM_SENSOR_* bus flags */
+ unsigned long flags;
+ /* Optional callbacks to power on or off and reset the sensor */
+ int (*power)(struct device *, int);
+ int (*reset)(struct device *);
++ /*
++ * some platforms may support different data widths than the sensors
++ * native ones due to different data line routing. Let the board code
++ * overwrite the width flags.
++ */
++ int (*set_bus_param)(struct soc_camera_link *, unsigned long flags);
++ unsigned long (*query_bus_param)(struct soc_camera_link *);
+ };
+
+ static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
+@@ -159,7 +166,8 @@ struct soc_camera_ops {
+ int (*release)(struct soc_camera_device *);
+ int (*start_capture)(struct soc_camera_device *);
+ int (*stop_capture)(struct soc_camera_device *);
+- int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *);
++ int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
++ int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
+ int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
+ unsigned long (*query_bus_param)(struct soc_camera_device *);
+ int (*set_bus_param)(struct soc_camera_device *, unsigned long);
+@@ -239,15 +247,19 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
static inline unsigned long soc_camera_bus_param_compatible(
unsigned long camera_flags, unsigned long bus_flags)
{
@@ -81343,7 +87026,7 @@
+
#endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
-index 55e41af..5d7146d 100644
+index 55e41af..3d8e96f 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -33,7 +33,9 @@
@@ -81357,8 +87040,13 @@
struct device *dev;
/* used to keep track of the registered subdevs */
struct list_head subdevs;
-@@ -44,7 +46,9 @@ struct v4l2_device {
+@@ -42,9 +44,14 @@ struct v4l2_device {
+ spinlock_t lock;
+ /* unique device name, by default the driver name + bus ID */
char name[V4L2_DEVICE_NAME_SIZE];
++ /* notify callback called by some sub-devices. */
++ void (*notify)(struct v4l2_subdev *sd,
++ unsigned int notification, void *arg);
};
-/* Initialize v4l2_dev and make dev->driver_data point to v4l2_dev */
@@ -81368,7 +87056,7 @@
int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev);
/* Set v4l2_dev->dev->driver_data to NULL and unregister all sub-devices */
void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
-@@ -52,23 +56,24 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
+@@ -52,23 +59,24 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
/* Register a subdev with a v4l2 device. While registered the subdev module
is marked as in-use. An error is returned if the module is no longer
loaded when you attempt to register it. */
@@ -81398,7 +87086,7 @@
if ((cond) && sd->ops->o && sd->ops->o->f) \
sd->ops->o->f(sd , ##args); \
} while (0)
-@@ -77,12 +82,12 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
+@@ -77,12 +85,12 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
If the callback returns an error other than 0 or -ENOIOCTLCMD, then
return with that error code. Note that you cannot add or delete a
subdev while walking the subdevs list. */
@@ -81413,7 +87101,7 @@
if ((cond) && sd->ops->o && sd->ops->o->f) \
err = sd->ops->o->f(sd , ##args); \
if (err && err != -ENOIOCTLCMD) \
-@@ -94,16 +99,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
+@@ -94,16 +102,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
/* Call the specified callback for all subdevs matching grp_id (if 0, then
match them all). Ignore any errors. Note that you cannot add or delete
a subdev while walking the subdevs list. */
@@ -81455,7 +87143,7 @@
int id, const char *name);
/* Prints the ioctl in a human-readable format */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
-index 37b09e5..05b6965 100644
+index 37b09e5..1b97a2c 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -78,6 +78,9 @@ struct v4l2_subdev_core_ops {
@@ -81495,6 +87183,28 @@
sd->name[0] = '\0';
sd->grp_id = 0;
sd->priv = NULL;
+@@ -186,4 +191,9 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
+ (!(sd) ? -ENODEV : (((sd) && (sd)->ops->o && (sd)->ops->o->f) ? \
+ (sd)->ops->o->f((sd) , ##args) : -ENOIOCTLCMD))
+
++/* Send a notification to v4l2_device. */
++#define v4l2_subdev_notify(sd, notification, arg) \
++ ((!(sd) || !(sd)->v4l2_dev || !(sd)->v4l2_dev->notify) ? -ENODEV : \
++ (sd)->v4l2_dev->notify((sd), (notification), (arg)))
++
+ #endif
+diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
+index 874f134..1c5946c 100644
+--- a/include/media/videobuf-core.h
++++ b/include/media/videobuf-core.h
+@@ -18,6 +18,7 @@
+
+ #include <linux/poll.h>
+ #ifdef CONFIG_VIDEO_V4L1_COMPAT
++#define __MIN_V4L1
+ #include <linux/videodev.h>
+ #endif
+ #include <linux/videodev2.h>
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index 426899e..5718a02 100644
--- a/include/sound/tea575x-tuner.h
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.7
retrieving revision 1.976.2.8
diff -u -r1.976.2.7 -r1.976.2.8
--- sources 12 Mar 2009 20:38:59 -0000 1.976.2.7
+++ sources 17 Mar 2009 21:35:51 -0000 1.976.2.8
@@ -1,3 +1,3 @@
d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2
-9404c2ead603a80a3aad6361b5fc5413 patch-2.6.29-rc7.bz2
-d6c3cc41935f007098e57c9222daabfc patch-2.6.29-rc7-git5.bz2
+0a86c29a637967fddeb1ba2ed8b33e59 patch-2.6.29-rc8.bz2
+682f205222f03b1a903fc437f9788cfa patch-2.6.29-rc8-git2.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.6
retrieving revision 1.888.2.7
diff -u -r1.888.2.6 -r1.888.2.7
--- upstream 12 Mar 2009 20:39:00 -0000 1.888.2.6
+++ upstream 17 Mar 2009 21:35:51 -0000 1.888.2.7
@@ -1,3 +1,4 @@
linux-2.6.28.tar.bz2
-patch-2.6.29-rc7.bz2
-patch-2.6.29-rc7-git5.bz2
+patch-2.6.29-rc8.bz2
+patch-2.6.29-rc8-git2.bz2
+
xen.pvops.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1.2.10 -r 1.1.2.11 xen.pvops.patch
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- xen.pvops.patch 12 Mar 2009 20:39:00 -0000 1.1.2.10
+++ xen.pvops.patch 17 Mar 2009 21:35:51 -0000 1.1.2.11
@@ -75,6 +75,18 @@
+Users:
+ kmemtrace-user - git://repo.or.cz/kmemtrace-user.git
+
+diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl
+index 3a882d9..c671a01 100644
+--- a/Documentation/DocBook/genericirq.tmpl
++++ b/Documentation/DocBook/genericirq.tmpl
+@@ -440,6 +440,7 @@ desc->chip->end();
+ used in the generic IRQ layer.
+ </para>
+ !Iinclude/linux/irq.h
++!Iinclude/linux/interrupt.h
+ </chapter>
+
+ <chapter id="pubfunctions">
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index 45932ec..b41f3e5 100644
--- a/Documentation/cputopology.txt
@@ -94,6 +106,31 @@
To be consistent on all architectures, include/linux/topology.h
provides default definitions for any of the above macros that are
+diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
+index 20d3b94..9aa1dda 100644
+--- a/Documentation/feature-removal-schedule.txt
++++ b/Documentation/feature-removal-schedule.txt
+@@ -344,3 +344,20 @@ Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
+ Removal is subject to fixing any remaining bugs in ACPI which may
+ cause the thermal throttling not to happen at the right time.
+ Who: Dave Jones <davej at redhat.com>, Matthew Garrett <mjg at redhat.com>
++
++-----------------------------
++
++What: __do_IRQ all in one fits nothing interrupt handler
++When: 2.6.32
++Why: __do_IRQ was kept for easy migration to the type flow handlers.
++ More than two years of migration time is enough.
++Who: Thomas Gleixner <tglx at linutronix.de>
++
++-----------------------------
++
++What: obsolete generic irq defines and typedefs
++When: 2.6.30
++Why: The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t)
++ have been kept around for migration reasons. After more than two years
++ it's time to remove them finally
++Who: Thomas Gleixner <tglx at linutronix.de>
diff --git a/Documentation/ftrace.txt b/Documentation/ftrace.txt
index 803b131..fd9a3e6 100644
--- a/Documentation/ftrace.txt
@@ -2527,10 +2564,10 @@
+If it does not work then please ask about it on the linux-kernel at vger.kernel.org
+mailing list or contact the x86 maintainers.
diff --git a/MAINTAINERS b/MAINTAINERS
-index 1c2ca1d..7669d87 100644
+index 4a1cfca..e2c0a9b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2623,6 +2623,20 @@ M: jason.wessel at windriver.com
+@@ -2621,6 +2621,20 @@ M: jason.wessel at windriver.com
L: kgdb-bugreport at lists.sourceforge.net
S: Maintained
@@ -2552,7 +2589,7 @@
P: Ananth N Mavinakayanahalli
M: ananth at in.ibm.com
diff --git a/Makefile b/Makefile
-index d04ee0a..32ae8b1 100644
+index 2e2f4a4..2d1ddfb 100644
--- a/Makefile
+++ b/Makefile
@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
@@ -2815,12 +2852,14 @@
route_irq(desc, i, newcpu);
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
-index 0021607..85598f7 100644
+index 0021607..1602373 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -65,6 +65,7 @@ SECTIONS
+@@ -64,7 +64,9 @@ SECTIONS
+ __initramfs_end = .;
#endif
. = ALIGN(4096);
++ __per_cpu_load = .;
__per_cpu_start = .;
+ *(.data.percpu.page_aligned)
*(.data.percpu)
@@ -4986,17 +5025,28 @@
{
if (!iommu_detected) {
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
-index 10a7d47..f45e4e5 100644
+index 10a7d47..3765efc 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
-@@ -219,6 +219,7 @@ SECTIONS
- .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET)
- {
- __per_cpu_start = .;
-+ *(.data.percpu.page_aligned)
- *(.data.percpu)
- *(.data.percpu.shared_aligned)
- __per_cpu_end = .;
+@@ -213,16 +213,9 @@ SECTIONS
+ { *(.data.cacheline_aligned) }
+
+ /* Per-cpu data: */
+- percpu : { } :percpu
+ . = ALIGN(PERCPU_PAGE_SIZE);
+- __phys_per_cpu_start = .;
+- .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET)
+- {
+- __per_cpu_start = .;
+- *(.data.percpu)
+- *(.data.percpu.shared_aligned)
+- __per_cpu_end = .;
+- }
++ PERCPU_VADDR(PERCPU_ADDR, :percpu)
++ __phys_per_cpu_start = __per_cpu_load;
+ . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
+ * into percpu page size
+ */
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index ca553b0..81e4289 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
@@ -5534,28 +5584,19 @@
#define __SWAB_64_THRU_32__
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
-index ac2c822..c1e6666 100644
+index 29e70e1..1c740f5 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
-@@ -120,7 +120,7 @@ int cpu_check_affinity(unsigned int irq, cpumask_t *dest)
- if (CHECK_IRQ_PER_CPU(irq)) {
- /* Bad linux design decision. The mask has already
- * been set; we must reset it */
-- irq_desc[irq].affinity = CPU_MASK_ALL;
-+ cpumask_setall(irq_desc[irq].affinity);
- return -EINVAL;
- }
-
-@@ -136,7 +136,7 @@ static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
- if (cpu_check_affinity(irq, dest))
+@@ -138,7 +138,7 @@ static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
+ if (cpu_dest < 0)
return;
-- irq_desc[irq].affinity = *dest;
-+ cpumask_copy(irq_desc[irq].affinity, dest);
+- cpumask_copy(&irq_desc[irq].affinity, &cpumask_of_cpu(cpu_dest));
++ cpumask_copy(&irq_desc[irq].affinity, dest);
}
#endif
-@@ -183,7 +183,7 @@ int show_interrupts(struct seq_file *p, void *v)
+@@ -185,7 +185,7 @@ int show_interrupts(struct seq_file *p, void *v)
seq_printf(p, "%3d: ", i);
#ifdef CONFIG_SMP
for_each_online_cpu(j)
@@ -5564,24 +5605,6 @@
#else
seq_printf(p, "%10u ", kstat_irqs(i));
#endif
-@@ -295,7 +295,7 @@ int txn_alloc_irq(unsigned int bits_wide)
- unsigned long txn_affinity_addr(unsigned int irq, int cpu)
- {
- #ifdef CONFIG_SMP
-- irq_desc[irq].affinity = cpumask_of_cpu(cpu);
-+ cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));
- #endif
-
- return per_cpu(cpu_data, cpu).txn_addr;
-@@ -352,7 +352,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
- irq = eirr_to_irq(eirr_val);
-
- #ifdef CONFIG_SMP
-- dest = irq_desc[irq].affinity;
-+ cpumask_copy(&dest, irq_desc[irq].affinity);
- if (CHECK_IRQ_PER_CPU(irq_desc[irq].status) &&
- !cpu_isset(smp_processor_id(), dest)) {
- int cpu = first_cpu(dest);
diff --git a/arch/powerpc/include/asm/bootx.h b/arch/powerpc/include/asm/bootx.h
index 57b82e3..60a3c9e 100644
--- a/arch/powerpc/include/asm/bootx.h
@@ -8963,17 +8986,65 @@
+ .generic_events = ppc970_generic_events,
+};
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
[...20171 lines suppressed...]
++ free_bootmem(__pa(ptr + pcpue_size),
++ pcpue_unit_size - pcpue_size);
++ memcpy(ptr, __per_cpu_load, static_size);
++ }
++
++ /* we're ready, commit */
++ pr_info("PERCPU: Embedded %zu pages at %p, static data %zu bytes\n",
++ pcpue_size >> PAGE_SHIFT, pcpue_ptr, static_size);
++
++ return pcpu_setup_first_chunk(pcpue_get_page, static_size,
++ reserved_size, dyn_size,
++ pcpue_unit_size, pcpue_ptr, NULL);
++}
diff --git a/mm/slab.c b/mm/slab.c
index 4d00855..497bff1 100644
--- a/mm/slab.c
@@ -135186,7 +145816,7 @@
EXPORT_SYMBOL(kfree);
diff --git a/mm/slob.c b/mm/slob.c
-index 52bc8a2..5961529 100644
+index 52bc8a2..20e5c25 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -65,6 +65,7 @@
@@ -135203,7 +145833,7 @@
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ void *ret;
+
-+ lockdep_trace_alloc(flags);
++ lockdep_trace_alloc(gfp);
if (size < PAGE_SIZE - align) {
if (!size)
@@ -135789,7 +146419,7 @@
return NULL;
diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 6177e3b..ae6f4c1 100644
+index 56ddf41..479e467 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1965,6 +1965,8 @@ static int kswapd(void *p)
@@ -136231,6 +146861,156 @@
}
close FH;
}
+diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
+index ad2434b..6654cbe 100644
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -500,6 +500,51 @@ static void optimize_token_table(void)
+ optimize_result();
+ }
+
++/* guess for "linker script provide" symbol */
++static int may_be_linker_script_provide_symbol(const struct sym_entry *se)
++{
++ const char *symbol = (char *)se->sym + 1;
++ int len = se->len - 1;
++
++ if (len < 8)
++ return 0;
++
++ if (symbol[0] != '_' || symbol[1] != '_')
++ return 0;
++
++ /* __start_XXXXX */
++ if (!memcmp(symbol + 2, "start_", 6))
++ return 1;
++
++ /* __stop_XXXXX */
++ if (!memcmp(symbol + 2, "stop_", 5))
++ return 1;
++
++ /* __end_XXXXX */
++ if (!memcmp(symbol + 2, "end_", 4))
++ return 1;
++
++ /* __XXXXX_start */
++ if (!memcmp(symbol + len - 6, "_start", 6))
++ return 1;
++
++ /* __XXXXX_end */
++ if (!memcmp(symbol + len - 4, "_end", 4))
++ return 1;
++
++ return 0;
++}
++
++static int prefix_underscores_count(const char *str)
++{
++ const char *tail = str;
++
++ while (*tail != '_')
++ tail++;
++
++ return tail - str;
++}
++
+ static int compare_symbols(const void *a, const void *b)
+ {
+ const struct sym_entry *sa;
+@@ -521,6 +566,18 @@ static int compare_symbols(const void *a, const void *b)
+ if (wa != wb)
+ return wa - wb;
+
++ /* sort by "linker script provide" type */
++ wa = may_be_linker_script_provide_symbol(sa);
++ wb = may_be_linker_script_provide_symbol(sb);
++ if (wa != wb)
++ return wa - wb;
++
++ /* sort by the number of prefix underscores */
++ wa = prefix_underscores_count((const char *)sa->sym + 1);
++ wb = prefix_underscores_count((const char *)sb->sym + 1);
++ if (wa != wb)
++ return wa - wb;
++
+ /* sort by initial order, so that other symbols are left undisturbed */
+ return sa->start_pos - sb->start_pos;
+ }
+diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
+index 3e1057f..4f1b488 100644
+--- a/scripts/kconfig/conf.c
++++ b/scripts/kconfig/conf.c
+@@ -11,6 +11,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <sys/time.h>
+
+ #define LKC_DIRECT_LINK
+ #include "lkc.h"
+@@ -464,9 +465,21 @@ int main(int ac, char **av)
+ input_mode = set_yes;
+ break;
+ case 'r':
++ {
++ struct timeval now;
++ unsigned int seed;
++
++ /*
++ * Use microseconds derived seed:
++ */
++ gettimeofday(&now, NULL);
++
++ seed = (unsigned int)(now.tv_sec*now.tv_usec);
++ srand(seed);
++
+ input_mode = set_random;
+- srand(time(NULL));
+ break;
++ }
+ case 'h':
+ printf(_("See README for usage info\n"));
+ exit(0);
+diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
+index 830d9ea..a3ceb80 100644
+--- a/scripts/kconfig/confdata.c
++++ b/scripts/kconfig/confdata.c
+@@ -863,21 +863,25 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
+
+ sym_calc_value(csym);
+ prop = sym_get_choice_prop(csym);
+- def = -1;
+- while (1) {
+- cnt = 0;
+- expr_list_for_each_sym(prop->expr, e, sym) {
+- if (sym->visible == no)
+- continue;
++ cnt = 0;
++ expr_list_for_each_sym(prop->expr, e, sym)
++ cnt++;
++
++ def = (rand() % cnt);
++
++ cnt = 0;
++ expr_list_for_each_sym(prop->expr, e, sym) {
++ if (sym) {
+ if (def == cnt++) {
++ sym->def[S_DEF_USER].tri = yes;
+ csym->def[S_DEF_USER].val = sym;
+- break;
++ }
++ else {
++ sym->def[S_DEF_USER].tri = no;
+ }
+ }
+- if (def >= 0 || cnt < 2)
+- break;
+- def = (rand() % cnt) + 1;
+ }
+ csym->flags |= SYMBOL_DEF_USER;
++ csym->flags &= ~(SYMBOL_VALID);
+ }
+ }
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8892161..7e62303 100644
--- a/scripts/mod/modpost.c
xen.pvops.post.patch:
Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- xen.pvops.post.patch 5 Mar 2009 01:30:27 -0000 1.1.2.4
+++ xen.pvops.post.patch 17 Mar 2009 21:35:53 -0000 1.1.2.5
@@ -844,6 +844,16 @@
- return ret;
-}
-#endif
+--- a/kernel/panic.c
++++ b/kernel/panic.c
+@@ -194,6 +194,7 @@ const char *print_tainted(void)
+
+ return buf;
+ }
++EXPORT_SYMBOL(print_tainted);
+
+ int test_taint(unsigned flag)
+ {
--- a/localversion-tip 2009-02-17 19:49:34.000000000 +0000
+++ /dev/null 2009-02-17 18:08:14.005240123 +0000
@@ -1 +0,0 @@
xen.pvops.pre.patch:
Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- xen.pvops.pre.patch 5 Mar 2009 01:30:27 -0000 1.1.2.4
+++ xen.pvops.pre.patch 17 Mar 2009 21:35:53 -0000 1.1.2.5
@@ -4,6 +4,7 @@
linux-2.6-debug-nmi-timeout.patch - arch/x86/kernel/nmi.c (moved to arch/x86/kernel/apic/nmi.c)
linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h
drm-next.patch - drivers/gpu/drm/drm_proc.c
+linux-2.6-debug-taint-vm.patch - kernel/panic.c
--- a/arch/x86/mm/pat.c 2009-02-14 12:49:46.000000000 +0000
+++ b/arch/x86/mm/pat.c 2009-02-14 09:16:34.000000000 +0000
@@ -849,3 +850,13 @@
+ return ret;
+}
+#endif
+--- a/kernel/panic.c
++++ b/kernel/panic.c
+@@ -194,7 +194,6 @@ const char *print_tainted(void)
+ snprintf(buf, sizeof(buf), "Not tainted");
+ return(buf);
+ }
+-EXPORT_SYMBOL(print_tainted);
+
+ int test_taint(unsigned flag)
+ {
--- linux-2.6-hdpvr-fix.patch DELETED ---
--- patch-2.6.29-rc7-git5.bz2.sign DELETED ---
--- patch-2.6.29-rc7.bz2.sign DELETED ---
--- squashfs-fix-page-aligned-data.patch DELETED ---
--- unifdef-rename-getline-symbol.patch DELETED ---
- Previous message (by thread): rpms/cvsweb/devel cvsweb.spec,1.14,1.15
- Next message (by thread): rpms/epiphany/devel epiphany.spec, 1.223, 1.224 build-fix.patch, 1.1, NONE build-fixes.patch, 1.1, NONE epiphany-2.25-moz191.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list