diff options
author | Christian König <christian.koenig@amd.com> | 2016-09-09 10:32:33 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-28 16:16:19 -0400 |
commit | bb990bb09235a3cc38fd4600d48c7bfb7a0a167c (patch) | |
tree | 4e493c06cf367598a3572c33fcdb829689263850 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
parent | 2744b647f49e24d636c8b293325aed674363f0d2 (diff) |
drm/amdgpu: add a custom GTT memory manager v2
Only allocate address space when we really need it.
v2: fix a typo, add correct function description,
stop leaking the node in the error case.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index b8412bcbad2a..b0f6e6957536 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -648,7 +648,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, | |||
648 | if (!r && p->uf_entry.robj) { | 648 | if (!r && p->uf_entry.robj) { |
649 | struct amdgpu_bo *uf = p->uf_entry.robj; | 649 | struct amdgpu_bo *uf = p->uf_entry.robj; |
650 | 650 | ||
651 | r = amdgpu_ttm_bind(uf->tbo.ttm, &uf->tbo.mem); | 651 | r = amdgpu_ttm_bind(&uf->tbo, &uf->tbo.mem); |
652 | p->job->uf_addr += amdgpu_bo_gpu_offset(uf); | 652 | p->job->uf_addr += amdgpu_bo_gpu_offset(uf); |
653 | } | 653 | } |
654 | 654 | ||
@@ -1192,7 +1192,7 @@ int amdgpu_cs_sysvm_access_required(struct amdgpu_cs_parser *parser) | |||
1192 | for (i = 0; i < parser->bo_list->num_entries; i++) { | 1192 | for (i = 0; i < parser->bo_list->num_entries; i++) { |
1193 | struct amdgpu_bo *bo = parser->bo_list->array[i].robj; | 1193 | struct amdgpu_bo *bo = parser->bo_list->array[i].robj; |
1194 | 1194 | ||
1195 | r = amdgpu_ttm_bind(bo->tbo.ttm, &bo->tbo.mem); | 1195 | r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem); |
1196 | if (unlikely(r)) | 1196 | if (unlikely(r)) |
1197 | return r; | 1197 | return r; |
1198 | } | 1198 | } |