diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/gpu/drm/radeon/r600_blit_kms.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_blit_kms.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_blit_kms.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 3473c00781ff..e5d4928fd2dc 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c | |||
| @@ -650,8 +650,8 @@ void r600_kms_blit_copy(struct radeon_device *rdev, | |||
| 650 | int src_x = src_gpu_addr & 255; | 650 | int src_x = src_gpu_addr & 255; |
| 651 | int dst_x = dst_gpu_addr & 255; | 651 | int dst_x = dst_gpu_addr & 255; |
| 652 | int h = 1; | 652 | int h = 1; |
| 653 | src_gpu_addr = src_gpu_addr & ~255; | 653 | src_gpu_addr = src_gpu_addr & ~255ULL; |
| 654 | dst_gpu_addr = dst_gpu_addr & ~255; | 654 | dst_gpu_addr = dst_gpu_addr & ~255ULL; |
| 655 | 655 | ||
| 656 | if (!src_x && !dst_x) { | 656 | if (!src_x && !dst_x) { |
| 657 | h = (cur_size / max_bytes); | 657 | h = (cur_size / max_bytes); |
| @@ -744,8 +744,8 @@ void r600_kms_blit_copy(struct radeon_device *rdev, | |||
| 744 | int src_x = (src_gpu_addr & 255); | 744 | int src_x = (src_gpu_addr & 255); |
| 745 | int dst_x = (dst_gpu_addr & 255); | 745 | int dst_x = (dst_gpu_addr & 255); |
| 746 | int h = 1; | 746 | int h = 1; |
| 747 | src_gpu_addr = src_gpu_addr & ~255; | 747 | src_gpu_addr = src_gpu_addr & ~255ULL; |
| 748 | dst_gpu_addr = dst_gpu_addr & ~255; | 748 | dst_gpu_addr = dst_gpu_addr & ~255ULL; |
| 749 | 749 | ||
| 750 | if (!src_x && !dst_x) { | 750 | if (!src_x && !dst_x) { |
| 751 | h = (cur_size / max_bytes); | 751 | h = (cur_size / max_bytes); |