aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-05-22 07:22:34 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-05-24 18:21:29 -0400
commitf5f3b16aae4ace99c330e54afe87f32aad3932dc (patch)
tree340aeeaa4e1d1494313c303d959ed37fdbade0c7 /drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
parent9a94f5a593c05c08ee309a55f618973427c5e074 (diff)
drm/amdgpu: fix merge of vcn_v1_0.c v2
That line got missed during the merge. v2: fix vcn_v1_0_enc_ring_emit_vm_flush as well Signed-off-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/vcn_v1_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c2
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 ad1862f64aeb..e8c8c78e389a 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -882,6 +882,7 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring,
882 uint32_t data0, data1, mask; 882 uint32_t data0, data1, mask;
883 unsigned eng = ring->vm_inv_eng; 883 unsigned eng = ring->vm_inv_eng;
884 884
885 pd_addr = ring->adev->gart.gart_funcs->adjust_mc_addr(ring->adev, pd_addr);
885 pd_addr = pd_addr | 0x1; /* valid bit */ 886 pd_addr = pd_addr | 0x1; /* valid bit */
886 /* now only use physical base address of PDE and valid */ 887 /* now only use physical base address of PDE and valid */
887 BUG_ON(pd_addr & 0xFFFF00000000003EULL); 888 BUG_ON(pd_addr & 0xFFFF00000000003EULL);
@@ -1014,6 +1015,7 @@ static void vcn_v1_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring,
1014 uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vm_id); 1015 uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vm_id);
1015 unsigned eng = ring->vm_inv_eng; 1016 unsigned eng = ring->vm_inv_eng;
1016 1017
1018 pd_addr = ring->adev->gart.gart_funcs->adjust_mc_addr(ring->adev, pd_addr);
1017 pd_addr = pd_addr | 0x1; /* valid bit */ 1019 pd_addr = pd_addr | 0x1; /* valid bit */
1018 /* now only use physical base address of PDE and valid */ 1020 /* now only use physical base address of PDE and valid */
1019 BUG_ON(pd_addr & 0xFFFF00000000003EULL); 1021 BUG_ON(pd_addr & 0xFFFF00000000003EULL);