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

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



UAPI Changes:
- Limit num_syncs to prevent oversized kernel allocations (Shuicheng)
- Disallow 0 OA property values (Ashutosh)
- Disallow 0 EU stall property values (Ashutosh)

Driver Changes:
- Fix kobject leak (Shuicheng)
- Workaround (Vinay)
- Loop variable reference fix (Matt Brost)
- Fix a CONFIG corner-case incorrect number of arguments (Arnd Bergmann)
- Skip reason prefix while emitting array (Raag)
- VF migration fix (Tomasz)
- Fix context in mei interrupt top half (Junxiao)
- Don't include the CCS metadata in the dma-buf sg-table (Thomas)
- VF queueing recovery work fix (Satyanarayana)
- Increase TDF timeout (Jagmeet)
- GT reset registers vs scheduler ordering fix (Jan)
- Adjust long-running workload timeslices (Matt Brost)
- Always set OA_OAGLBCTXCTRL_COUNTER_RESUME (Ashutosh)
- Fix a return value (Dan Carpenter)
- Drop preempt-fences when destroying imported dma-bufs (Thomas)
- Use usleep_range for accurate long-running workload timeslicing (Matthew)

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patch.msgid.link/aUSMlQ4iruzm0NQR@fedora
parents 77de4a27 80f9c601

drivers/gpu/drm/xe/xe_bo.c

+4 −11
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ static bool xe_ttm_bo_lock_in_destructor(struct ttm_buffer_object *ttm_bo) 
	 * always succeed here, as long as we hold the lru lock.

	 */

	spin_lock(&ttm_bo->bdev->lru_lock);

	locked = dma_resv_trylock(ttm_bo->base.resv);

	locked = dma_resv_trylock(&ttm_bo->base._resv);

	spin_unlock(&ttm_bo->bdev->lru_lock);

	xe_assert(xe, locked);
@@ -1547,13 +1547,6 @@ static void xe_ttm_bo_release_notify(struct ttm_buffer_object *ttm_bo) 
	bo = ttm_to_xe_bo(ttm_bo);

	xe_assert(xe_bo_device(bo), !(bo->created && kref_read(&ttm_bo->base.refcount)));



	/*

	 * Corner case where TTM fails to allocate memory and this BOs resv

	 * still points the VMs resv

	 */

	if (ttm_bo->base.resv != &ttm_bo->base._resv)

		return;



	if (!xe_ttm_bo_lock_in_destructor(ttm_bo))

		return;
@@ -1563,14 +1556,14 @@ static void xe_ttm_bo_release_notify(struct ttm_buffer_object *ttm_bo) 
	 * TODO: Don't do this for external bos once we scrub them after

	 * unbind.

	 */

	dma_resv_for_each_fence(&cursor, ttm_bo->base.resv,

	dma_resv_for_each_fence(&cursor, &ttm_bo->base._resv,

				DMA_RESV_USAGE_BOOKKEEP, fence) {

		if (xe_fence_is_xe_preempt(fence) &&

		    !dma_fence_is_signaled(fence)) {

			if (!replacement)

				replacement = dma_fence_get_stub();



			dma_resv_replace_fences(ttm_bo->base.resv,

			dma_resv_replace_fences(&ttm_bo->base._resv,

						fence->context,

						replacement,

						DMA_RESV_USAGE_BOOKKEEP);
@@ -1578,7 +1571,7 @@ static void xe_ttm_bo_release_notify(struct ttm_buffer_object *ttm_bo) 
	}

	dma_fence_put(replacement);



	dma_resv_unlock(ttm_bo->base.resv);

	dma_resv_unlock(&ttm_bo->base._resv);

}



static void xe_ttm_bo_delete_mem_notify(struct ttm_buffer_object *ttm_bo)

drivers/gpu/drm/xe/xe_device.c

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ static void tdf_request_sync(struct xe_device *xe) 
		 * transient and need to be flushed..

		 */

		if (xe_mmio_wait32(&gt->mmio, XE2_TDF_CTRL, TRANSIENT_FLUSH_REQUEST, 0,

				   150, NULL, false))

				   300, NULL, false))

			xe_gt_err_once(gt, "TD flush timeout\n");



		xe_force_wake_put(gt_to_fw(gt), fw_ref);

drivers/gpu/drm/xe/xe_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static struct sg_table *xe_dma_buf_map(struct dma_buf_attachment *attach, 
	case XE_PL_TT:

		sgt = drm_prime_pages_to_sg(obj->dev,

					    bo->ttm.ttm->pages,

					    bo->ttm.ttm->num_pages);

					    obj->size >> PAGE_SHIFT);

		if (IS_ERR(sgt))

			return sgt;

drivers/gpu/drm/xe/xe_eu_stall.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int xe_eu_stall_user_ext_set_property(struct xe_device *xe, u64 extension 
		return -EFAULT;



	if (XE_IOCTL_DBG(xe, ext.property >= ARRAY_SIZE(xe_set_eu_stall_property_funcs)) ||

	    XE_IOCTL_DBG(xe, ext.pad))

	    XE_IOCTL_DBG(xe, !ext.property) || XE_IOCTL_DBG(xe, ext.pad))

		return -EINVAL;



	idx = array_index_nospec(ext.property, ARRAY_SIZE(xe_set_eu_stall_property_funcs));

drivers/gpu/drm/xe/xe_exec.c

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 


	if (XE_IOCTL_DBG(xe, args->extensions) ||

	    XE_IOCTL_DBG(xe, args->pad[0] || args->pad[1] || args->pad[2]) ||

	    XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]))

	    XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]) ||

	    XE_IOCTL_DBG(xe, args->num_syncs > DRM_XE_MAX_SYNCS))

		return -EINVAL;



	q = xe_exec_queue_lookup(xef, args->exec_queue_id);