diff options
author | Christian König <christian.koenig@amd.com> | 2018-01-12 09:26:08 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:17:44 -0500 |
commit | 132f34e4b558488cc8d153a1d18833054a76e44c (patch) | |
tree | f3395e8c95a922f65b43d6d3185c082d2f7f039c /drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |
parent | 770d13b19fdf365a99e559f1d47f1380910a947d (diff) |
drm/amdgpu: move struct gart_funcs into amdgpu_gmc.h
And rename it to struct gmc_funcs.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Samuel Li <Samuel.Li@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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index b99e15c43e45..659a8f2d9bf8 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |||
@@ -891,12 +891,12 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, | |||
891 | unsigned vmid, uint64_t pd_addr) | 891 | unsigned vmid, uint64_t pd_addr) |
892 | { | 892 | { |
893 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; | 893 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; |
894 | uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vmid); | 894 | uint32_t req = ring->adev->gmc.gmc_funcs->get_invalidate_req(vmid); |
895 | uint64_t flags = AMDGPU_PTE_VALID; | 895 | uint64_t flags = AMDGPU_PTE_VALID; |
896 | unsigned eng = ring->vm_inv_eng; | 896 | unsigned eng = ring->vm_inv_eng; |
897 | uint32_t data0, data1, mask; | 897 | uint32_t data0, data1, mask; |
898 | 898 | ||
899 | amdgpu_gart_get_vm_pde(ring->adev, -1, &pd_addr, &flags); | 899 | amdgpu_gmc_get_vm_pde(ring->adev, -1, &pd_addr, &flags); |
900 | pd_addr |= flags; | 900 | pd_addr |= flags; |
901 | 901 | ||
902 | data0 = (hub->ctx0_ptb_addr_hi32 + vmid * 2) << 2; | 902 | data0 = (hub->ctx0_ptb_addr_hi32 + vmid * 2) << 2; |
@@ -1024,11 +1024,11 @@ static void vcn_v1_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, | |||
1024 | unsigned int vmid, uint64_t pd_addr) | 1024 | unsigned int vmid, uint64_t pd_addr) |
1025 | { | 1025 | { |
1026 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; | 1026 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; |
1027 | uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vmid); | 1027 | uint32_t req = ring->adev->gmc.gmc_funcs->get_invalidate_req(vmid); |
1028 | uint64_t flags = AMDGPU_PTE_VALID; | 1028 | uint64_t flags = AMDGPU_PTE_VALID; |
1029 | unsigned eng = ring->vm_inv_eng; | 1029 | unsigned eng = ring->vm_inv_eng; |
1030 | 1030 | ||
1031 | amdgpu_gart_get_vm_pde(ring->adev, -1, &pd_addr, &flags); | 1031 | amdgpu_gmc_get_vm_pde(ring->adev, -1, &pd_addr, &flags); |
1032 | pd_addr |= flags; | 1032 | pd_addr |= flags; |
1033 | 1033 | ||
1034 | amdgpu_ring_write(ring, VCN_ENC_CMD_REG_WRITE); | 1034 | amdgpu_ring_write(ring, VCN_ENC_CMD_REG_WRITE); |