aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/si.c
diff options
context:
space:
mode:
authorGravatar Alex Deucher <alexander.deucher@amd.com> 2020-06-22 18:10:36 -0400
committerGravatar Alex Deucher <alexander.deucher@amd.com> 2020-07-01 01:59:24 -0400
commit9c39d77c07127b1343995e4753bc4045e89979da (patch)
tree0ed85b9da58ea60d773bd36c0149b9c47bffb67b /drivers/gpu/drm/amd/amdgpu/si.c
parentdrm/amd/display: fix compilation error on allmodconfig (diff)
downloadlinux-9c39d77c07127b1343995e4753bc4045e89979da.tar.gz
linux-9c39d77c07127b1343995e4753bc4045e89979da.tar.bz2
linux-9c39d77c07127b1343995e4753bc4045e89979da.zip
drm/amdgpu/uvd3.x: fix register definition warnings
drop the duplicate register macros from sid.h and use the standard ones in the oss register headers. Acked-by: Christian König <christian.koenig@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/si.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 153db3f763bc..dfbf42666bae 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -44,6 +44,7 @@
#include "dce_virtual.h"
#include "gca/gfx_6_0_d.h"
#include "oss/oss_1_0_d.h"
+#include "oss/oss_1_0_sh_mask.h"
#include "gmc/gmc_6_0_d.h"
#include "dce/dce_6_0_d.h"
#include "uvd/uvd_4_0_d.h"