summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-07-12 10:05:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-04 16:51:05 +0800
commitc35486752501196044bbc4a1c61c43f39b17c2ff (patch)
tree63e781ffb4dda82043cf8007392dfc6ff576ca98
parent1b4eafabcef5a74ccbc6edd201353cf23046a5a5 (diff)
downloadlinux-3.10-c35486752501196044bbc4a1c61c43f39b17c2ff.tar.gz
linux-3.10-c35486752501196044bbc4a1c61c43f39b17c2ff.tar.bz2
linux-3.10-c35486752501196044bbc4a1c61c43f39b17c2ff.zip
drm/radeon: fix UVD fence emit
commit c9a6ca4abd5f1978ef15b3ece3474f4372ae5fe7 upstream. Currently doesn't matter cause we allocate the fence in the lower 265MB anyway. Reported-by: Frank Huang <FrankR.Huang@amd.com> Signed-off-by: Christian König <christian.koenig@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/r600.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 6948eb88c2b..b60004e0820 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2986,7 +2986,7 @@ void r600_uvd_fence_emit(struct radeon_device *rdev,
struct radeon_fence *fence)
{
struct radeon_ring *ring = &rdev->ring[fence->ring];
- uint32_t addr = rdev->fence_drv[fence->ring].gpu_addr;
+ uint64_t addr = rdev->fence_drv[fence->ring].gpu_addr;
radeon_ring_write(ring, PACKET0(UVD_CONTEXT_ID, 0));
radeon_ring_write(ring, fence->seq);