Commit edb1745f authored by Matthew Auld's avatar Matthew Auld
Browse files

drm/xe: improve dma-resv handling for backup object 



Since the dma-resv is shared we don't need to reserve and add a fence
slot fence twice, plus no need to loop through the dependencies.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://lore.kernel.org/r/20250829164715.720735-2-matthew.auld@intel.com
parent 7477c4bd

drivers/gpu/drm/xe/xe_bo.c

+1 −12
Original line number Diff line number Diff line
@@ -1260,14 +1260,11 @@ int xe_bo_evict_pinned(struct xe_bo *bo) 
		else

			migrate = mem_type_to_migrate(xe, bo->ttm.resource->mem_type);



		xe_assert(xe, bo->ttm.base.resv == backup->ttm.base.resv);

		ret = dma_resv_reserve_fences(bo->ttm.base.resv, 1);

		if (ret)

			goto out_backup;



		ret = dma_resv_reserve_fences(backup->ttm.base.resv, 1);

		if (ret)

			goto out_backup;



		fence = xe_migrate_copy(migrate, bo, backup, bo->ttm.resource,

					backup->ttm.resource, false);

		if (IS_ERR(fence)) {
@@ -1277,8 +1274,6 @@ int xe_bo_evict_pinned(struct xe_bo *bo) 


		dma_resv_add_fence(bo->ttm.base.resv, fence,

				   DMA_RESV_USAGE_KERNEL);

		dma_resv_add_fence(backup->ttm.base.resv, fence,

				   DMA_RESV_USAGE_KERNEL);

		dma_fence_put(fence);

	} else {

		ret = xe_bo_vmap(backup);
@@ -1356,10 +1351,6 @@ int xe_bo_restore_pinned(struct xe_bo *bo) 
		if (ret)

			goto out_unlock_bo;



		ret = dma_resv_reserve_fences(backup->ttm.base.resv, 1);

		if (ret)

			goto out_unlock_bo;



		fence = xe_migrate_copy(migrate, backup, bo,

					backup->ttm.resource, bo->ttm.resource,

					false);
@@ -1370,8 +1361,6 @@ int xe_bo_restore_pinned(struct xe_bo *bo) 


		dma_resv_add_fence(bo->ttm.base.resv, fence,

				   DMA_RESV_USAGE_KERNEL);

		dma_resv_add_fence(backup->ttm.base.resv, fence,

				   DMA_RESV_USAGE_KERNEL);

		dma_fence_put(fence);

	} else {

		ret = xe_bo_vmap(backup);

drivers/gpu/drm/xe/xe_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ struct dma_fence *xe_migrate_copy(struct xe_migrate *m, 
		if (!fence) {

			err = xe_sched_job_add_deps(job, src_bo->ttm.base.resv,

						    DMA_RESV_USAGE_BOOKKEEP);

			if (!err && src_bo != dst_bo)

			if (!err && src_bo->ttm.base.resv != dst_bo->ttm.base.resv)

				err = xe_sched_job_add_deps(job, dst_bo->ttm.base.resv,

							    DMA_RESV_USAGE_BOOKKEEP);

			if (err)