projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| dde97f1d GKH |
1 | From 2126d0a4a205e2d6b763434f892524cd60f74228 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Deucher <alexdeucher@gmail.com> | |
| 3 | Date: Wed, 6 Oct 2010 00:13:04 -0400 | |
| 4 | Subject: drm/radeon/kms: make sure blit addr masks are 64 bit | |
| 5 | ||
| 6 | From: Alex Deucher <alexdeucher@gmail.com> | |
| 7 | ||
| 8 | commit 2126d0a4a205e2d6b763434f892524cd60f74228 upstream. | |
| 9 | ||
| 10 | Signed-off-by: Alex Deucher <alexdeucher@gmail.com> | |
| 11 | Signed-off-by: Dave Airlie <airlied@redhat.com> | |
| 12 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 13 | ||
| 14 | --- | |
| 15 | drivers/gpu/drm/radeon/r600_blit_kms.c | 8 ++++---- | |
| 16 | 1 file changed, 4 insertions(+), 4 deletions(-) | |
| 17 | ||
| 18 | --- a/drivers/gpu/drm/radeon/r600_blit_kms.c | |
| 19 | +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c | |
| 20 | @@ -650,8 +650,8 @@ void r600_kms_blit_copy(struct radeon_de | |
| 21 | int src_x = src_gpu_addr & 255; | |
| 22 | int dst_x = dst_gpu_addr & 255; | |
| 23 | int h = 1; | |
| 24 | - src_gpu_addr = src_gpu_addr & ~255; | |
| 25 | - dst_gpu_addr = dst_gpu_addr & ~255; | |
| 26 | + src_gpu_addr = src_gpu_addr & ~255ULL; | |
| 27 | + dst_gpu_addr = dst_gpu_addr & ~255ULL; | |
| 28 | ||
| 29 | if (!src_x && !dst_x) { | |
| 30 | h = (cur_size / max_bytes); | |
| 31 | @@ -744,8 +744,8 @@ void r600_kms_blit_copy(struct radeon_de | |
| 32 | int src_x = (src_gpu_addr & 255); | |
| 33 | int dst_x = (dst_gpu_addr & 255); | |
| 34 | int h = 1; | |
| 35 | - src_gpu_addr = src_gpu_addr & ~255; | |
| 36 | - dst_gpu_addr = dst_gpu_addr & ~255; | |
| 37 | + src_gpu_addr = src_gpu_addr & ~255ULL; | |
| 38 | + dst_gpu_addr = dst_gpu_addr & ~255ULL; | |
| 39 | ||
| 40 | if (!src_x && !dst_x) { | |
| 41 | h = (cur_size / max_bytes); |