aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-12-03 13:55:52 -0500
committerAlex Deucher <alexander.deucher@amd.com>2015-12-04 13:05:44 -0500
commitf3f1769283b8dbf047c678da95b72194ac2477a1 (patch)
tree67895dab78f4ebecf06cbd9832e548152c5c8751
parente9d951a832d9a5db33f9d981a810a37f851f8b39 (diff)
drm/amdgpu: take a BO reference for the user fence
No need for a GEM reference here. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 1d44d508d4d4..4f352ec9dec4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -222,6 +222,8 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
222 } 222 }
223 223
224 p->uf.bo = gem_to_amdgpu_bo(gobj); 224 p->uf.bo = gem_to_amdgpu_bo(gobj);
225 amdgpu_bo_ref(p->uf.bo);
226 drm_gem_object_unreference_unlocked(gobj);
225 p->uf.offset = fence_data->offset; 227 p->uf.offset = fence_data->offset;
226 } else { 228 } else {
227 ret = -EINVAL; 229 ret = -EINVAL;
@@ -487,7 +489,7 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo
487 amdgpu_ib_free(parser->adev, &parser->ibs[i]); 489 amdgpu_ib_free(parser->adev, &parser->ibs[i]);
488 kfree(parser->ibs); 490 kfree(parser->ibs);
489 if (parser->uf.bo) 491 if (parser->uf.bo)
490 drm_gem_object_unreference_unlocked(&parser->uf.bo->gem_base); 492 amdgpu_bo_unref(&parser->uf.bo);
491} 493}
492 494
493static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p, 495static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p,
@@ -776,7 +778,7 @@ static int amdgpu_cs_free_job(struct amdgpu_job *job)
776 amdgpu_ib_free(job->adev, &job->ibs[i]); 778 amdgpu_ib_free(job->adev, &job->ibs[i]);
777 kfree(job->ibs); 779 kfree(job->ibs);
778 if (job->uf.bo) 780 if (job->uf.bo)
779 drm_gem_object_unreference_unlocked(&job->uf.bo->gem_base); 781 amdgpu_bo_unref(&job->uf.bo);
780 return 0; 782 return 0;
781} 783}
782 784