summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-08-23 10:07:28 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-08-24 16:25:05 -0400
commit70a033d25b197b0a4e60509911195613cf28b57e (patch)
treeaac61d4ba61f74c1fbaba7580e8a905a9bc9bfb3 /drivers/gpu/drm/radeon/si.c
parentc8b4f288f4276078f169a404e2d1ac1535f82b93 (diff)
downloadlinux-stable-70a033d25b197b0a4e60509911195613cf28b57e.tar.gz
linux-stable-70a033d25b197b0a4e60509911195613cf28b57e.tar.bz2
linux-stable-70a033d25b197b0a4e60509911195613cf28b57e.zip
drm/radeon: switch UVD code to use UVD_NO_OP for padding
Replace packet2's with packet0 writes to UVD_NO_OP. The value written to UVD_NO_OP does not matter. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
-rw-r--r--drivers/gpu/drm/radeon/si.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index ae5ee74e69a3..7ee9aafbdf74 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -6920,7 +6920,7 @@ static void si_uvd_resume(struct radeon_device *rdev)
return;
ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
- r = radeon_ring_init(rdev, ring, ring->ring_size, 0, RADEON_CP_PACKET2);
+ r = radeon_ring_init(rdev, ring, ring->ring_size, 0, PACKET0(UVD_NO_OP, 0));
if (r) {
dev_err(rdev->dev, "failed initializing UVD ring (%d).\n", r);
return;