Commit 84335a99 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2026-05-21' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



- SRIOV related fixes (Wajdeczko, Mohanram)
- Fix leak and double-free (Lin)
- Multi-cast register fixes (Gustavo)
- Multi-queue fix (Niranjana)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/ag9rR5VwCdkA0lzI@intel.com
parents 4378a411 4d253425

drivers/gpu/drm/xe/regs/xe_gt_regs.h

+3 −1
Original line number Diff line number Diff line
@@ -152,10 +152,11 @@ 


#define XEHPG_INSTDONE_GEOM_SVGUNIT		XE_REG_MCR(0x666c)



#define CACHE_MODE_1				XE_REG(0x7004, XE_REG_OPTION_MASKED)

#define CACHE_MODE_1				XE_REG_MCR(0x7004, XE_REG_OPTION_MASKED)

#define   MSAA_OPTIMIZATION_REDUC_DISABLE	REG_BIT(11)



#define COMMON_SLICE_CHICKEN1			XE_REG(0x7010, XE_REG_OPTION_MASKED)

#define XEHP_COMMON_SLICE_CHICKEN1		XE_REG_MCR(0x7010, XE_REG_OPTION_MASKED)

#define   DISABLE_BOTTOM_CLIP_RECTANGLE_TEST	REG_BIT(14)



#define HIZ_CHICKEN					XE_REG(0x7018, XE_REG_OPTION_MASKED)
@@ -178,6 +179,7 @@ 
#define XEHPG_SC_INSTDONE_EXTRA2		XE_REG_MCR(0x7108)



#define COMMON_SLICE_CHICKEN4			XE_REG(0x7300, XE_REG_OPTION_MASKED)

#define XEHP_COMMON_SLICE_CHICKEN4		XE_REG_MCR(0x7300, XE_REG_OPTION_MASKED)

#define   SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE	REG_BIT(12)

#define   DISABLE_TDC_LOAD_BALANCING_CALC	REG_BIT(6)

#define   HW_FILTERING				REG_BIT(5)

drivers/gpu/drm/xe/xe_gsc.c

+1 −4
Original line number Diff line number Diff line
@@ -482,8 +482,7 @@ int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc) 
				 EXEC_QUEUE_FLAG_PERMANENT, 0);

	if (IS_ERR(q)) {

		xe_gt_err(gt, "Failed to create queue for GSC submission\n");

		err = PTR_ERR(q);

		goto out_bo;

		return PTR_ERR(q);

	}



	wq = alloc_ordered_workqueue("gsc-ordered-wq", 0);
@@ -506,8 +505,6 @@ int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc) 


out_q:

	xe_exec_queue_put(q);

out_bo:

	xe_bo_unpin_map_no_vm(bo);

	return err;

}

drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c

+5 −1
Original line number Diff line number Diff line
@@ -114,8 +114,10 @@ int xe_gt_sriov_pf_monitor_process_guc2pf(struct xe_gt *gt, const u32 *msg, u32 
 * VFs with no events are not printed.

 *

 * This function can only be called on PF.

 *

 * Return: always 0

 */

void xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p)

{

	unsigned int n, total_vfs = xe_gt_sriov_pf_get_totalvfs(gt);

	const struct xe_gt_sriov_monitor *data;
@@ -144,4 +146,6 @@ void xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p 
#undef __format

#undef __value

	}



	return 0;

}

drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ struct drm_printer; 
struct xe_gt;



void xe_gt_sriov_pf_monitor_flr(struct xe_gt *gt, u32 vfid);

void xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p);

int xe_gt_sriov_pf_monitor_print_events(struct xe_gt *gt, struct drm_printer *p);



#ifdef CONFIG_PCI_IOV

int xe_gt_sriov_pf_monitor_process_guc2pf(struct xe_gt *gt, const u32 *msg, u32 len);

drivers/gpu/drm/xe/xe_gt_sriov_vf.c

+18 −6
Original line number Diff line number Diff line
@@ -1137,13 +1137,15 @@ void xe_gt_sriov_vf_write32(struct xe_gt *gt, struct xe_reg reg, u32 val) 
}



/**

 * xe_gt_sriov_vf_print_config - Print VF self config.

 * xe_gt_sriov_vf_print_config() - Print VF self config.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * This function is for VF use only.

 *

 * Return: always 0.

 */

void xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p)

{

	struct xe_gt_sriov_vf_selfconfig *config = &gt->sriov.vf.self_config;

	struct xe_device *xe = gt_to_xe(gt);
@@ -1170,16 +1172,20 @@ void xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p) 


	drm_printf(p, "GuC contexts:\t%u\n", config->num_ctxs);

	drm_printf(p, "GuC doorbells:\t%u\n", config->num_dbs);



	return 0;

}



/**

 * xe_gt_sriov_vf_print_runtime - Print VF's runtime regs received from PF.

 * xe_gt_sriov_vf_print_runtime() - Print VF's runtime regs received from PF.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * This function is for VF use only.

 *

 * Return: always 0.

 */

void xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p)

{

	struct vf_runtime_reg *vf_regs = gt->sriov.vf.runtime.regs;

	unsigned int size = gt->sriov.vf.runtime.num_regs;
@@ -1188,16 +1194,20 @@ void xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p) 


	for (; size--; vf_regs++)

		drm_printf(p, "%#x = %#x\n", vf_regs->offset, vf_regs->value);



	return 0;

}



/**

 * xe_gt_sriov_vf_print_version - Print VF ABI versions.

 * xe_gt_sriov_vf_print_version() - Print VF ABI versions.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * This function is for VF use only.

 *

 * Return: always 0.

 */

void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p)

{

	struct xe_device *xe = gt_to_xe(gt);

	struct xe_uc_fw_version *guc_version = &gt->sriov.vf.guc_version;
@@ -1227,6 +1237,8 @@ void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p) 
		   GUC_RELAY_VERSION_LATEST_MAJOR, GUC_RELAY_VERSION_LATEST_MINOR);

	drm_printf(p, "\thandshake:\t%u.%u\n",

		   pf_version->major, pf_version->minor);



	return 0;

}



static bool vf_post_migration_shutdown(struct xe_gt *gt)