Commit 78e6e468 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2024-07-18' of... 

Merge tag 'drm-xe-next-fixes-2024-07-18' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

- Xe_exec ioctl minor fix on sync entry cleanup upon error (Ashutosh)
- SRIOV: limit VF LMEM provisioning (Michal)
- Wedge mode fixes (Brost)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zpk6CI0FDoTJwkSb@intel.com
parents 7d4ecf37 90936a0a

drivers/gpu/drm/xe/xe_device.c

+20 −0
Original line number Diff line number Diff line
@@ -854,6 +854,13 @@ u64 xe_device_uncanonicalize_addr(struct xe_device *xe, u64 address) 
	return address & GENMASK_ULL(xe->info.va_bits - 1, 0);

}



static void xe_device_wedged_fini(struct drm_device *drm, void *arg)

{

	struct xe_device *xe = arg;



	xe_pm_runtime_put(xe);

}



/**

 * xe_device_declare_wedged - Declare device wedged

 * @xe: xe device instance
@@ -870,11 +877,21 @@ u64 xe_device_uncanonicalize_addr(struct xe_device *xe, u64 address) 
 */

void xe_device_declare_wedged(struct xe_device *xe)

{

	struct xe_gt *gt;

	u8 id;



	if (xe->wedged.mode == 0) {

		drm_dbg(&xe->drm, "Wedged mode is forcibly disabled\n");

		return;

	}



	if (drmm_add_action_or_reset(&xe->drm, xe_device_wedged_fini, xe)) {

		drm_err(&xe->drm, "Failed to register xe_device_wedged_fini clean-up. Although device is wedged.\n");

		return;

	}



	xe_pm_runtime_get_noresume(xe);



	if (!atomic_xchg(&xe->wedged.flag, 1)) {

		xe->needs_flr_on_fini = true;

		drm_err(&xe->drm,
@@ -883,4 +900,7 @@ void xe_device_declare_wedged(struct xe_device *xe) 
			"Please file a _new_ bug report at https://gitlab.freedesktop.org/drm/xe/kernel/issues/new\n",

			dev_name(xe->drm.dev));

	}



	for_each_gt(gt, xe, id)

		xe_gt_declare_wedged(gt);

}

drivers/gpu/drm/xe/xe_exec.c

+7 −7
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	u64 addresses[XE_HW_ENGINE_MAX_INSTANCE];

	struct drm_gpuvm_exec vm_exec = {.extra.fn = xe_exec_fn};

	struct drm_exec *exec = &vm_exec.exec;

	u32 i, num_syncs = 0, num_ufence = 0;

	u32 i, num_syncs, num_ufence = 0;

	struct xe_sched_job *job;

	struct xe_vm *vm;

	bool write_locked, skip_retry = false;
@@ -156,15 +156,15 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 


	vm = q->vm;



	for (i = 0; i < args->num_syncs; i++) {

		err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs++],

					  &syncs_user[i], SYNC_PARSE_FLAG_EXEC |

	for (num_syncs = 0; num_syncs < args->num_syncs; num_syncs++) {

		err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs],

					  &syncs_user[num_syncs], SYNC_PARSE_FLAG_EXEC |

					  (xe_vm_in_lr_mode(vm) ?

					   SYNC_PARSE_FLAG_LR_MODE : 0));

		if (err)

			goto err_syncs;



		if (xe_sync_is_ufence(&syncs[i]))

		if (xe_sync_is_ufence(&syncs[num_syncs]))

			num_ufence++;

	}
@@ -325,8 +325,8 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	if (err == -EAGAIN && !skip_retry)

		goto retry;

err_syncs:

	for (i = 0; i < num_syncs; i++)

		xe_sync_entry_cleanup(&syncs[i]);

	while (num_syncs--)

		xe_sync_entry_cleanup(&syncs[num_syncs]);

	kfree(syncs);

err_exec_queue:

	xe_exec_queue_put(q);

drivers/gpu/drm/xe/xe_gt.c

+15 −0
Original line number Diff line number Diff line
@@ -904,3 +904,18 @@ struct xe_hw_engine *xe_gt_any_hw_engine(struct xe_gt *gt) 


	return NULL;

}



/**

 * xe_gt_declare_wedged() - Declare GT wedged

 * @gt: the GT object

 *

 * Wedge the GT which stops all submission, saves desired debug state, and

 * cleans up anything which could timeout.

 */

void xe_gt_declare_wedged(struct xe_gt *gt)

{

	xe_gt_assert(gt, gt_to_xe(gt)->wedged.mode);



	xe_uc_declare_wedged(&gt->uc);

	xe_gt_tlb_invalidation_reset(gt);

}

drivers/gpu/drm/xe/xe_gt.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct xe_gt *xe_gt_alloc(struct xe_tile *tile); 
int xe_gt_init_hwconfig(struct xe_gt *gt);

int xe_gt_init_early(struct xe_gt *gt);

int xe_gt_init(struct xe_gt *gt);

void xe_gt_declare_wedged(struct xe_gt *gt);

int xe_gt_record_default_lrcs(struct xe_gt *gt);



/**

drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c

+1 −0
Original line number Diff line number Diff line
@@ -1543,6 +1543,7 @@ static u64 pf_estimate_fair_lmem(struct xe_gt *gt, unsigned int num_vfs) 
	u64 fair;



	fair = div_u64(available, num_vfs);

	fair = rounddown_pow_of_two(fair);	/* XXX: ttm_vram_mgr & drm_buddy limitation */

	fair = ALIGN_DOWN(fair, alignment);

#ifdef MAX_FAIR_LMEM

	fair = min_t(u64, MAX_FAIR_LMEM, fair);