Commit 82b9c55b authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: fix VM page table reference counting 



We use the reservation object of the page directory for the page tables as
well, because of this the page directory should be freed last. Ensure that
by keeping a reference from the page tables to the directory.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 585116c5

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ struct amdgpu_bo { 
	/* Constant after initialization */

	struct amdgpu_device		*adev;

	struct drm_gem_object		gem_base;

	struct amdgpu_bo		*parent;



	struct ttm_bo_kmap_obj		dma_buf_vmap;

	pid_t				pid;

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) 
	list_del_init(&bo->list);

	mutex_unlock(&bo->adev->gem.mutex);

	drm_gem_object_release(&bo->gem_base);

	amdgpu_bo_unref(&bo->parent);

	kfree(bo->metadata);

	kfree(bo);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+5 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,11 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, 
		if (r)

			goto error_free;



		/* Keep a reference to the page table to avoid freeing

		 * them up in the wrong order.

		 */

		pt->parent = amdgpu_bo_ref(vm->page_directory);



		r = amdgpu_vm_clear_bo(adev, pt);

		if (r) {

			amdgpu_bo_unref(&pt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE