projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d942e43
)
Revert "drm/radeon/kms: fix typo in r100_blit_copy"
author
Dave Airlie
<airlied@redhat.com>
Fri, 23 Sep 2011 13:00:54 +0000
(14:00 +0100)
committer
Dave Airlie
<airlied@redhat.com>
Fri, 23 Sep 2011 13:01:44 +0000
(14:01 +0100)
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>
drivers/gpu/drm/radeon/r100.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/r100.c
b/drivers/gpu/drm/radeon/r100.c
index 5b1837b4aacfb04ce52064c363db3ef7b438ac59..7fcdbbbf297965044e550e611d8eb8b32a086051 100644
(file)
--- 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));