summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-08-17 09:46:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-15 08:20:26 +0200
commit952cbbb0fcccdf22c98e18c94ec1ad849537e33a (patch)
treeeb28d82b906f5087ed25560341b1d91493ac647f
parent382089caae9c81d296dd4c5db9c2db05d7e8d80b (diff)
downloadlinux-stable-952cbbb0fcccdf22c98e18c94ec1ad849537e33a.tar.gz
linux-stable-952cbbb0fcccdf22c98e18c94ec1ad849537e33a.tar.bz2
linux-stable-952cbbb0fcccdf22c98e18c94ec1ad849537e33a.zip
drm/radeon: fix radeon_move_blit on 32bit systems
commit 13f479b9df4e2bbf2d16e7e1b02f3f55f70e2455 upstream. This bug seems to be present for a very long time. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 590b0377fbe2..0ab76dd13eb7 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -263,8 +263,8 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
rdev = radeon_get_rdev(bo->bdev);
ridx = radeon_copy_ring_index(rdev);
- old_start = old_mem->start << PAGE_SHIFT;
- new_start = new_mem->start << PAGE_SHIFT;
+ old_start = (u64)old_mem->start << PAGE_SHIFT;
+ new_start = (u64)new_mem->start << PAGE_SHIFT;
switch (old_mem->mem_type) {
case TTM_PL_VRAM: