From: Dave Airlie Date: Fri, 23 Sep 2011 13:00:54 +0000 (+0100) Subject: Revert "drm/radeon/kms: fix typo in r100_blit_copy" X-Git-Tag: firefly_0821_release~7541^2~2627 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=549c431cbdf20ab3b3d1f0f2fa81abc17f9104e2;p=firefly-linux-kernel-4.4.55.git Revert "drm/radeon/kms: fix typo in r100_blit_copy" 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 830e1f1c6a09..7fcdbbbf2979 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, 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));