summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-08-11 16:44:15 +0200
committerAlex Deucher <alexander.deucher@amd.com>2016-08-16 10:43:59 -0400
commitb7fc2cbd5e9fd4fbac1c3a9fda6eff2b28b7bc4d (patch)
treefe3da1ac0f7771ecdada3f425af3ae03182b0992 /drivers/gpu
parentb0456f93063ec8629cfeee6d03758f92793d96cb (diff)
downloadop-kernel-dev-b7fc2cbd5e9fd4fbac1c3a9fda6eff2b28b7bc4d.zip
op-kernel-dev-b7fc2cbd5e9fd4fbac1c3a9fda6eff2b28b7bc4d.tar.gz
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')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c10
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 e5095b5..51db44a 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 {
struct amdgpu_device *adev;
/* address where to copy page table entries from */
uint64_t src;
- /* DMA addresses to use for mapping */
- dma_addr_t *pages_addr;
/* indirect buffer to fill with commands */
struct amdgpu_ib *ib;
};
@@ -492,11 +490,6 @@ static void amdgpu_vm_update_pages(struct amdgpu_pte_update_params *params,
amdgpu_vm_copy_pte(params->adev, params->ib,
pe, (params->src + (addr >> 12) * 8), count);
- } else if (params->pages_addr) {
- amdgpu_vm_write_pte(params->adev, params->ib,
- params->pages_addr,
- pe, addr, count, incr, flags);
-
} else if (count < 3) {
amdgpu_vm_write_pte(params->adev, params->ib, NULL, pe, addr,
count, incr, flags);
@@ -826,7 +819,7 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params,
uint32_t frag;
/* system pages are non continuously */
- if (params->src || params->pages_addr || !(flags & AMDGPU_PTE_VALID) ||
+ if (params->src || !(flags & AMDGPU_PTE_VALID) ||
(frag_start >= frag_end)) {
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,
memset(&params, 0, sizeof(params));
params.adev = adev;
params.src = src;
- params.pages_addr = pages_addr;
/* sync to everything on unmapping */
if (!(flags & AMDGPU_PTE_VALID))
OpenPOWER on IntegriCloud