summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-11-03 10:38:52 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-03 10:38:52 -0700
commitbd4d32dc1ebc29a12804c0242d528b0643aa6d9c (patch)
tree80cfccfb877326234172bc16a4fb37d09a734d40
parent3154e5c8fbdb13667a6d62ca96b79b4697b986db (diff)
downloadlongterm-queue-2.6.32-bd4d32dc1ebc29a12804c0242d528b0643aa6d9c.tar.gz
remove drm-radeon-kms-fix-typo-in-r100_blit_copy.patch
-rw-r--r--queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch36
-rw-r--r--queue-2.6.32/series1
2 files changed, 0 insertions, 37 deletions
diff --git a/queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch b/queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch
deleted file mode 100644
index c1d4e1e..0000000
--- a/queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 18b4fada275dd2b6dd9db904ddf70fe39e272222 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 16 Sep 2011 12:04:07 -0400
-Subject: drm/radeon/kms: fix typo in r100_blit_copy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit 18b4fada275dd2b6dd9db904ddf70fe39e272222 upstream.
-
-cur_pages is the number of pages per loop iteration.
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-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
-@@ -355,8 +355,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, cur_pages);
-+ radeon_ring_write(rdev, cur_pages);
- radeon_ring_write(rdev, cur_pages | (stride_pixels << 16));
- }
- radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0));
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 7829726..d85e2f0 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -25,7 +25,6 @@ qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.p
e1000-fix-driver-to-be-used-on-pa-risc-c8000-workstations.patch
asoc-fix-reporting-of-partial-jack-updates.patch
alsa-hda-cirrus-fix-surround-speaker-volume-control-name.patch
-drm-radeon-kms-fix-typo-in-r100_blit_copy.patch
cifs-fix-possible-memory-corruption-in-cifsfindnext.patch
b43-fix-beacon-problem-in-ad-hoc-mode.patch
wireless-reset-beacon_found-while-updating-regulatory.patch