diff options
author | Christian König <christian.koenig@amd.com> | 2016-08-11 10:44:15 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-16 10:43:59 -0400 |
commit | b7fc2cbd5e9fd4fbac1c3a9fda6eff2b28b7bc4d (patch) | |
tree | fe3da1ac0f7771ecdada3f425af3ae03182b0992 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
parent | b0456f93063ec8629cfeee6d03758f92793d96cb (diff) |
drm/amdgpu: remove pages_addr handling from the VM code
Not needed any more.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index e5095b5e10e5..51db44abdfa5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |||
@@ -62,8 +62,6 @@ struct amdgpu_pte_update_params { | |||
62 | struct amdgpu_device *adev; | 62 | struct amdgpu_device *adev; |
63 | /* address where to copy page table entries from */ | 63 | /* address where to copy page table entries from */ |
64 | uint64_t src; | 64 | uint64_t src; |
65 | /* DMA addresses to use for mapping */ | ||
66 | dma_addr_t *pages_addr; | ||
67 | /* indirect buffer to fill with commands */ | 65 | /* indirect buffer to fill with commands */ |
68 | struct amdgpu_ib *ib; | 66 | struct amdgpu_ib *ib; |
69 | }; | 67 | }; |
@@ -492,11 +490,6 @@ static void amdgpu_vm_update_pages(struct amdgpu_pte_update_params *params, | |||
492 | amdgpu_vm_copy_pte(params->adev, params->ib, | 490 | amdgpu_vm_copy_pte(params->adev, params->ib, |
493 | pe, (params->src + (addr >> 12) * 8), count); | 491 | pe, (params->src + (addr >> 12) * 8), count); |
494 | 492 | ||
495 | } else if (params->pages_addr) { | ||
496 | amdgpu_vm_write_pte(params->adev, params->ib, | ||
497 | params->pages_addr, | ||
498 | pe, addr, count, incr, flags); | ||
499 | |||
500 | } else if (count < 3) { | 493 | } else if (count < 3) { |
501 | amdgpu_vm_write_pte(params->adev, params->ib, NULL, pe, addr, | 494 | amdgpu_vm_write_pte(params->adev, params->ib, NULL, pe, addr, |
502 | count, incr, flags); | 495 | count, incr, flags); |
@@ -826,7 +819,7 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params, | |||
826 | uint32_t frag; | 819 | uint32_t frag; |
827 | 820 | ||
828 | /* system pages are non continuously */ | 821 | /* system pages are non continuously */ |
829 | if (params->src || params->pages_addr || !(flags & AMDGPU_PTE_VALID) || | 822 | if (params->src || !(flags & AMDGPU_PTE_VALID) || |
830 | (frag_start >= frag_end)) { | 823 | (frag_start >= frag_end)) { |
831 | 824 | ||
832 | amdgpu_vm_update_ptes(params, vm, start, end, dst, flags); | 825 | amdgpu_vm_update_ptes(params, vm, start, end, dst, flags); |
@@ -894,7 +887,6 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, | |||
894 | memset(¶ms, 0, sizeof(params)); | 887 | memset(¶ms, 0, sizeof(params)); |
895 | params.adev = adev; | 888 | params.adev = adev; |
896 | params.src = src; | 889 | params.src = src; |
897 | params.pages_addr = pages_addr; | ||
898 | 890 | ||
899 | /* sync to everything on unmapping */ | 891 | /* sync to everything on unmapping */ |
900 | if (!(flags & AMDGPU_PTE_VALID)) | 892 | if (!(flags & AMDGPU_PTE_VALID)) |