diff options
author | Hawking Zhang <Hawking.Zhang@amd.com> | 2017-05-15 05:03:02 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-05-24 18:07:59 -0400 |
commit | 04e5f2a63547d8d9eb4a7eda371a9252e779976b (patch) | |
tree | 39e41390e97a6594adc780eccd6ba9ee7d3946b1 /drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |
parent | c651fd7c116b7438730b9ea8c154a29ca77f88d1 (diff) |
drm/amdgpu: correct vmhub for vcn dec/enc ring
This got missed due to differences in the trees
when raven support was merged.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: ken wang <Qingqing.Wang@amd.com>
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/vcn_v1_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 454d4af348e6..94104a9990aa 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |||
@@ -1104,6 +1104,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { | |||
1104 | .align_mask = 0xf, | 1104 | .align_mask = 0xf, |
1105 | .nop = PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP), 0), | 1105 | .nop = PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP), 0), |
1106 | .support_64bit_ptrs = false, | 1106 | .support_64bit_ptrs = false, |
1107 | .vmhub = AMDGPU_MMHUB, | ||
1107 | .get_rptr = vcn_v1_0_dec_ring_get_rptr, | 1108 | .get_rptr = vcn_v1_0_dec_ring_get_rptr, |
1108 | .get_wptr = vcn_v1_0_dec_ring_get_wptr, | 1109 | .get_wptr = vcn_v1_0_dec_ring_get_wptr, |
1109 | .set_wptr = vcn_v1_0_dec_ring_set_wptr, | 1110 | .set_wptr = vcn_v1_0_dec_ring_set_wptr, |
@@ -1132,6 +1133,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { | |||
1132 | .align_mask = 0x3f, | 1133 | .align_mask = 0x3f, |
1133 | .nop = VCN_ENC_CMD_NO_OP, | 1134 | .nop = VCN_ENC_CMD_NO_OP, |
1134 | .support_64bit_ptrs = false, | 1135 | .support_64bit_ptrs = false, |
1136 | .vmhub = AMDGPU_MMHUB, | ||
1135 | .get_rptr = vcn_v1_0_enc_ring_get_rptr, | 1137 | .get_rptr = vcn_v1_0_enc_ring_get_rptr, |
1136 | .get_wptr = vcn_v1_0_enc_ring_get_wptr, | 1138 | .get_wptr = vcn_v1_0_enc_ring_get_wptr, |
1137 | .set_wptr = vcn_v1_0_enc_ring_set_wptr, | 1139 | .set_wptr = vcn_v1_0_enc_ring_set_wptr, |