From 33f6cc9e7adbd5a47bc3ad89ad4ca03a4af0c98f Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 16 Sep 2011 12:04:07 -0400 Subject: [PATCH] --- yaml --- r: 263967 b: refs/heads/master c: 18b4fada275dd2b6dd9db904ddf70fe39e272222 h: refs/heads/master i: 263965: 2aba579d47c1db312dd259d3b4e5febdc61c3ff3 263963: d8be9b31c0a63c8a0046d7f2be6eb651cc06391c 263959: 6d20407096fc907b9561002686df112cc31e1378 263951: 8339bc957234da1b8ff1f39ac2dc1f1422868a9d 263935: 2aeffdc455642c4ae8453cc5a6ffa9d7ad678700 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r100.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cf982599a6f7..f677b3cdc384 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db318d7a8a910657f10ffdf223c971af20a9b09c +refs/heads/master: 18b4fada275dd2b6dd9db904ddf70fe39e272222 diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c index 11e44a3479e3..a536505342d8 100644 --- a/trunk/drivers/gpu/drm/radeon/r100.c +++ b/trunk/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, 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));