Commit 85bf89f2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Driver Changes:
- Avoid a NULL ptr deref when wedging (Lucas)
- Fix power gate sequence on DG1 (Rodrigo)

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z4AcqP3Io_r0pEsR@fedora
parents 66d4709a b84e1cd2

drivers/gpu/drm/xe/xe_gt.c

+4 −4
Original line number Diff line number Diff line
@@ -387,6 +387,10 @@ int xe_gt_init_early(struct xe_gt *gt) 
	xe_force_wake_init_gt(gt, gt_to_fw(gt));

	spin_lock_init(&gt->global_invl_lock);



	err = xe_gt_tlb_invalidation_init_early(gt);

	if (err)

		return err;



	return 0;

}
@@ -588,10 +592,6 @@ int xe_gt_init(struct xe_gt *gt) 
		xe_hw_fence_irq_init(&gt->fence_irq[i]);

	}



	err = xe_gt_tlb_invalidation_init(gt);

	if (err)

		return err;



	err = xe_gt_pagefault_init(gt);

	if (err)

		return err;

drivers/gpu/drm/xe/xe_gt_idle.c

+6 −4
Original line number Diff line number Diff line
@@ -122,11 +122,13 @@ void xe_gt_idle_enable_pg(struct xe_gt *gt) 
	if (!xe_gt_is_media_type(gt))

		gtidle->powergate_enable |= RENDER_POWERGATE_ENABLE;



	if (xe->info.platform != XE_DG1) {

		for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j) {

			if ((gt->info.engine_mask & BIT(i)))

				gtidle->powergate_enable |= (VDN_HCP_POWERGATE_ENABLE(j) |

							     VDN_MFXVDENC_POWERGATE_ENABLE(j));

		}

	}



	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);

	if (xe->info.skip_guc_pc) {

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void xe_gt_tlb_fence_timeout(struct work_struct *work) 
}



/**

 * xe_gt_tlb_invalidation_init - Initialize GT TLB invalidation state

 * xe_gt_tlb_invalidation_init_early - Initialize GT TLB invalidation state

 * @gt: graphics tile

 *

 * Initialize GT TLB invalidation state, purely software initialization, should
@@ -114,7 +114,7 @@ static void xe_gt_tlb_fence_timeout(struct work_struct *work) 
 *

 * Return: 0 on success, negative error code on error.

 */

int xe_gt_tlb_invalidation_init(struct xe_gt *gt)

int xe_gt_tlb_invalidation_init_early(struct xe_gt *gt)

{

	gt->tlb_invalidation.seqno = 1;

	INIT_LIST_HEAD(&gt->tlb_invalidation.pending_fences);

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ struct xe_gt; 
struct xe_guc;

struct xe_vma;



int xe_gt_tlb_invalidation_init(struct xe_gt *gt);

int xe_gt_tlb_invalidation_init_early(struct xe_gt *gt);



void xe_gt_tlb_invalidation_reset(struct xe_gt *gt);

int xe_gt_tlb_invalidation_ggtt(struct xe_gt *gt);

int xe_gt_tlb_invalidation_vma(struct xe_gt *gt,