summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-09-23 14:00:54 +0100
committerDave Airlie <airlied@redhat.com>2011-09-23 14:01:44 +0100
commitd9ad77ebfd3a304306f9f18ff3f9e522da075e27 (patch)
tree50c2dd370a9eaf51cdedc69b7608a7f78abb612f
parentd942e43b58dc27b36305bcd374a74f7cc15183a3 (diff)
downloadop-kernel-dev-d9ad77ebfd3a304306f9f18ff3f9e522da075e27.zip
op-kernel-dev-d9ad77ebfd3a304306f9f18ff3f9e522da075e27.tar.gz
Revert "drm/radeon/kms: fix typo in r100_blit_copy"
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>
-rw-r--r--drivers/gpu/drm/radeon/r100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 5b1837b..7fcdbbb 100644
--- 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 *rdev,
radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
radeon_ring_write(rdev, 0);
radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
- radeon_ring_write(rdev, cur_pages);
- radeon_ring_write(rdev, cur_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));
OpenPOWER on IntegriCloud