diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 12:28:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 12:28:02 -0700 |
| commit | 3e8e31579854ab849c7d10e00e45d1998c4851fa (patch) | |
| tree | 5e4641d4281dd5be661ddecfe8fccbb4c6022ecb | |
| parent | 902bb164594dc813acf17ebe47967a710955e4a8 (diff) | |
| download | stable-queue-3e8e31579854ab849c7d10e00e45d1998c4851fa.tar.gz | |
3.0 patches
| -rw-r--r-- | queue-3.0/revert-drm-radeon-kms-fix-typo-in-r100_blit_copy.patch | 35 | ||||
| -rw-r--r-- | queue-3.0/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/queue-3.0/revert-drm-radeon-kms-fix-typo-in-r100_blit_copy.patch b/queue-3.0/revert-drm-radeon-kms-fix-typo-in-r100_blit_copy.patch new file mode 100644 index 0000000000..8c835c8333 --- /dev/null +++ b/queue-3.0/revert-drm-radeon-kms-fix-typo-in-r100_blit_copy.patch @@ -0,0 +1,35 @@ +From d9ad77ebfd3a304306f9f18ff3f9e522da075e27 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Fri, 23 Sep 2011 14:00:54 +0100 +Subject: Revert "drm/radeon/kms: fix typo in r100_blit_copy" + +From: Dave Airlie <airlied@redhat.com> + +commit d9ad77ebfd3a304306f9f18ff3f9e522da075e27 upstream. + +This reverts commit 18b4fada275dd2b6dd9db904ddf70fe39e272222. + +This code was correct, apologies to anyone who noticed things broke. + +revert contents are different due to another commit in between. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/gpu/drm/radeon/r100.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/radeon/r100.c ++++ b/drivers/gpu/drm/radeon/r100.c +@@ -773,8 +773,8 @@ int r100_copy_blit(struct radeon_device + radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16)); + radeon_ring_write(rdev, 0); + radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16)); +- radeon_ring_write(rdev, num_pages); +- radeon_ring_write(rdev, num_pages); ++ radeon_ring_write(rdev, num_gpu_pages); ++ radeon_ring_write(rdev, num_gpu_pages); + radeon_ring_write(rdev, cur_pages | (stride_pixels << 16)); + } + radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0)); diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 0000000000..99549fc62f --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1 @@ +revert-drm-radeon-kms-fix-typo-in-r100_blit_copy.patch |