iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/ttm: individualize resv objects before calling release_notify

Browse Source 
This allows release_notify to add and remove fences from deleted objects.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: xinhui pan <xinhui.pan@amd.com>
Link: https://patchwork.freedesktop.org/patch/352750/
This commit is contained in:
Christian König
2020-02-10 13:04:25 +01:00
parent 519c2de003
commit f704ff7c3d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/ttm/ttm_bo.c
View File

@@ -572,14 +572,6 @@ static void ttm_bo_release(struct kref *kref)
int ret; int ret;
if (!bo->deleted) { if (!bo->deleted) {
if (bo->bdev->driver->release_notify)
bo->bdev->driver->release_notify(bo);
drm_vma_offset_remove(bdev->vma_manager, &bo->base.vma_node);
ttm_mem_io_lock(man, false);
ttm_mem_io_free_vm(bo);
ttm_mem_io_unlock(man);
ret = ttm_bo_individualize_resv(bo); ret = ttm_bo_individualize_resv(bo);
if (ret) { if (ret) {
/* Last resort, if we fail to allocate memory for the /* Last resort, if we fail to allocate memory for the
@@ -588,6 +580,14 @@ static void ttm_bo_release(struct kref *kref)
dma_resv_wait_timeout_rcu(bo->base.resv, true, false, dma_resv_wait_timeout_rcu(bo->base.resv, true, false,
30 * HZ); 30 * HZ);
} }
if (bo->bdev->driver->release_notify)
bo->bdev->driver->release_notify(bo);
drm_vma_offset_remove(bdev->vma_manager, &bo->base.vma_node);
ttm_mem_io_lock(man, false);
ttm_mem_io_free_vm(bo);
ttm_mem_io_unlock(man);
} }
if (!dma_resv_test_signaled_rcu(bo->base.resv, true)) { if (!dma_resv_test_signaled_rcu(bo->base.resv, true)) {