summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-08-22 17:58:14 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-08-24 16:25:04 -0400
commit8dd31d74acc1371d143fd0b2795dc3d16fb47202 (patch)
tree33c6a0d6f3518ea6da2d6a33f0cfc383a6181add /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
parenta22f803cd22c3aac780757df712aebb79e1778c1 (diff)
downloadlinux-stable-8dd31d74acc1371d143fd0b2795dc3d16fb47202.tar.gz
linux-stable-8dd31d74acc1371d143fd0b2795dc3d16fb47202.tar.bz2
linux-stable-8dd31d74acc1371d143fd0b2795dc3d16fb47202.zip
drm/amdgpu: add support for UVD_NO_OP register
Writes to this register are the preferred way to do NOPs. Bump the driver version as well. 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index bf59354d788a..811fe985acdf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -818,6 +818,7 @@ static int amdgpu_uvd_cs_reg(struct amdgpu_uvd_cs_ctx *ctx,
return r;
break;
case mmUVD_ENGINE_CNTL:
+ case mmUVD_NO_OP:
break;
default:
DRM_ERROR("Invalid reg 0x%X!\n", reg);