summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/radeon_fence.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-04-14 14:47:59 +0400
committerAlex Deucher <alexander.deucher@amd.com>2013-04-22 18:39:11 +0400
commitd7c605a20ee86a4e8f19ca7b33f7c4f7ba0468bc (patch)
treeab429fdc575556d28e9a9b70ac0e6d043db48816 /drivers/gpu/drm/radeon/radeon_fence.c
parenta92c7d554fbfa5ec1008e4c856a2206c2cce45a4 (diff)
downloadlinux-d7c605a20ee86a4e8f19ca7b33f7c4f7ba0468bc.tar.xz
drm/radeon: fix alignment of UVD fence
Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fence.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_fence.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 82fe1835ff8c..1a699cefaac7 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -776,10 +776,9 @@ int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring)
} else {
/* put fence directly behind firmware */
- rdev->fence_drv[ring].cpu_addr = rdev->uvd.cpu_addr +
- rdev->uvd_fw->size;
- rdev->fence_drv[ring].gpu_addr = rdev->uvd.gpu_addr +
- rdev->uvd_fw->size;
+ index = ALIGN(rdev->uvd_fw->size, 8);
+ rdev->fence_drv[ring].cpu_addr = rdev->uvd.cpu_addr + index;
+ rdev->fence_drv[ring].gpu_addr = rdev->uvd.gpu_addr + index;
}
} else {