Commit a24823d1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2025-06-12' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



Driver Changes:
- Fix regression disallowing 64K SVM migration (Maarten)
- Use a bounce buffer for WA BB (Lucas)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://lore.kernel.org/r/aEsBQoh5Si3ouPgE@fedora
parents 19272b37 9c7632fa

drivers/gpu/drm/xe/xe_lrc.c

+20 −4
Original line number Diff line number Diff line
@@ -941,11 +941,18 @@ static void xe_lrc_finish(struct xe_lrc *lrc) 
 * store it in the PPHSWP.

 */

#define CONTEXT_ACTIVE 1ULL

static void xe_lrc_setup_utilization(struct xe_lrc *lrc)

static int xe_lrc_setup_utilization(struct xe_lrc *lrc)

{

	u32 *cmd;

	u32 *cmd, *buf = NULL;



	if (lrc->bb_per_ctx_bo->vmap.is_iomem) {

		buf = kmalloc(lrc->bb_per_ctx_bo->size, GFP_KERNEL);

		if (!buf)

			return -ENOMEM;

		cmd = buf;

	} else {

		cmd = lrc->bb_per_ctx_bo->vmap.vaddr;

	}



	*cmd++ = MI_STORE_REGISTER_MEM | MI_SRM_USE_GGTT | MI_SRM_ADD_CS_OFFSET;

	*cmd++ = ENGINE_ID(0).addr;
@@ -966,9 +973,16 @@ static void xe_lrc_setup_utilization(struct xe_lrc *lrc) 


	*cmd++ = MI_BATCH_BUFFER_END;



	if (buf) {

		xe_map_memcpy_to(gt_to_xe(lrc->gt), &lrc->bb_per_ctx_bo->vmap, 0,

				 buf, (cmd - buf) * sizeof(*cmd));

		kfree(buf);

	}



	xe_lrc_write_ctx_reg(lrc, CTX_BB_PER_CTX_PTR,

			     xe_bo_ggtt_addr(lrc->bb_per_ctx_bo) | 1);



	return 0;

}



#define PVC_CTX_ASID		(0x2e + 1)
@@ -1125,7 +1139,9 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, 
	map = __xe_lrc_start_seqno_map(lrc);

	xe_map_write32(lrc_to_xe(lrc), &map, lrc->fence_ctx.next_seqno - 1);



	xe_lrc_setup_utilization(lrc);

	err = xe_lrc_setup_utilization(lrc);

	if (err)

		goto err_lrc_finish;



	return 0;

drivers/gpu/drm/xe/xe_svm.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static bool xe_svm_range_needs_migrate_to_vram(struct xe_svm_range *range, 
		return false;

	}



	if (range_size <= SZ_64K && !supports_4K_migration(vm->xe)) {

	if (range_size < SZ_64K && !supports_4K_migration(vm->xe)) {

		drm_dbg(&vm->xe->drm, "Platform doesn't support SZ_4K range migration\n");

		return false;

	}