Commit 1bb53d05 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

Merge drm/drm-next into drm-xe-next 



Additional backmerge to avoid excessive diffstats when
sending PR.

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parents 84a11c51 d2b9e2f8

drivers/gpu/drm/ttm/ttm_bo_vm.c

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, 
		struct ttm_operation_ctx ctx = {

			.interruptible = true,

			.no_wait_gpu = false,

			.force_alloc = true

		};



		ttm = bo->ttm;

drivers/gpu/drm/ttm/ttm_resource.c

+0 −1
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ int ttm_resource_manager_evict_all(struct ttm_device *bdev, 
	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false,

		.force_alloc = true

	};

	struct dma_fence *fence;

	int ret;

drivers/gpu/drm/xe/xe_bo.c

+1 −3
Original line number Diff line number Diff line
@@ -2930,19 +2930,17 @@ int xe_bo_migrate(struct xe_bo *bo, u32 mem_type) 
/**

 * xe_bo_evict - Evict an object to evict placement

 * @bo: The buffer object to migrate.

 * @force_alloc: Set force_alloc in ttm_operation_ctx

 *

 * On successful completion, the object memory will be moved to evict

 * placement. This function blocks until the object has been fully moved.

 *

 * Return: 0 on success. Negative error code on failure.

 */

int xe_bo_evict(struct xe_bo *bo, bool force_alloc)

int xe_bo_evict(struct xe_bo *bo)

{

	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false,

		.force_alloc = force_alloc,

		.gfp_retry_mayfail = true,

	};

	struct ttm_placement placement;

drivers/gpu/drm/xe/xe_bo.h

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res); 
bool xe_bo_can_migrate(struct xe_bo *bo, u32 mem_type);



int xe_bo_migrate(struct xe_bo *bo, u32 mem_type);

int xe_bo_evict(struct xe_bo *bo, bool force_alloc);

int xe_bo_evict(struct xe_bo *bo);



int xe_bo_evict_pinned(struct xe_bo *bo);

int xe_bo_notifier_prepare_pinned(struct xe_bo *bo);

drivers/gpu/drm/xe/xe_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void xe_dma_buf_move_notify(struct dma_buf_attachment *attach) 
	struct drm_gem_object *obj = attach->importer_priv;

	struct xe_bo *bo = gem_to_xe_bo(obj);



	XE_WARN_ON(xe_bo_evict(bo, false));

	XE_WARN_ON(xe_bo_evict(bo));

}



static const struct dma_buf_attach_ops xe_dma_buf_attach_ops = {