| 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)); |