diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-08-23 09:12:21 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-24 16:25:05 -0400 |
commit | c8b4f288f4276078f169a404e2d1ac1535f82b93 (patch) | |
tree | dfcdea61a17ed6c2873262a5e296710830343f5f /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
parent | 4d6bdbad25e60eac1d14c039cbc32778e9dec8fe (diff) | |
download | linux-stable-c8b4f288f4276078f169a404e2d1ac1535f82b93.tar.gz linux-stable-c8b4f288f4276078f169a404e2d1ac1535f82b93.tar.bz2 linux-stable-c8b4f288f4276078f169a404e2d1ac1535f82b93.zip |
drm/amdgpu: 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/amd/amdgpu/amdgpu_uvd.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index 811fe985acdf..af408b6c6e05 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -957,8 +957,10 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, ib->ptr[3] = addr >> 32; ib->ptr[4] = PACKET0(mmUVD_GPCOM_VCPU_CMD, 0); ib->ptr[5] = 0; - for (i = 6; i < 16; ++i) - ib->ptr[i] = PACKET2(0); + for (i = 6; i < 16; i += 2) { + ib->ptr[i] = PACKET0(mmUVD_NO_OP, 0); + ib->ptr[i+1] = 0; + } ib->length_dw = 16; if (direct) { |