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

Merge tag 'drm-xe-next-2024-10-31' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next 



UAPI Changes:
- Define and parse OA sync properties (Ashutosh)

Driver Changes:
- Add caller info to xe_gt_reset_async (Nirmoy)
- A large forcewake rework / cleanup (Himal)
- A g2h response timeout fix (Badal)
- A PTL workaround (Vinay)
- Handle unreliable MMIO reads during forcewake (Shuicheng)
- Ufence user-space access fixes (Nirmoy)
- Annotate flexible arrays (Matthew Brost)
- Enable GuC lite restore (Fei)
- Prevent GuC register capture on VF (Zhanjun)
- Show VFs VRAM / LMEM provisioning summary over debugfs (Michal)
- Parallel queues fix on GT reset (Nirmoy)
- Move reference grabbing to a job's dma-fence (Matt Brost)
- Mark a number of local workqueues WQ_MEM_RECLAIM (Matt Brost)
- OA synchronization support (Ashutosh)
- Capture all available bits of GuC timestamp to GuC log (John)
- Increase readability of guc_info debugfs (John)
- Add a mmio barrier before GGTT invalidate (Matt Brost)
- Don't short-circuit TDR on jobs not started (Matt Brost)

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZyNvA_vZZYR-1eWE@fedora
parents ffd99396 35d25a4a

drivers/gpu/drm/xe/abi/guc_klvs_abi.h

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ enum xe_guc_klv_ids { 
	GUC_WORKAROUND_KLV_ID_DISABLE_MTP_DURING_ASYNC_COMPUTE				= 0x9007,

	GUC_WA_KLV_NP_RD_WRITE_TO_CLEAR_RCSM_AT_CGP_LATE_RESTORE			= 0x9008,

	GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET				= 0x9009,

	GUC_WA_KLV_WAKE_POWER_DOMAINS_FOR_OUTBOUND_MMIO					= 0x900a,

};



#endif

drivers/gpu/drm/xe/display/xe_hdcp_gsc.c

+4 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ bool intel_hdcp_gsc_check_status(struct intel_display *display) 
	struct xe_gt *gt = tile->media_gt;

	struct xe_gsc *gsc = &gt->uc.gsc;

	bool ret = true;

	unsigned int fw_ref;



	if (!gsc && !xe_uc_fw_is_enabled(&gsc->fw)) {

		drm_dbg_kms(&xe->drm,
@@ -50,7 +51,8 @@ bool intel_hdcp_gsc_check_status(struct intel_display *display) 
	}



	xe_pm_runtime_get(xe);

	if (xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC)) {

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

	if (!fw_ref) {

		drm_dbg_kms(&xe->drm,

			    "failed to get forcewake to check proxy status\n");

		ret = false;
@@ -60,7 +62,7 @@ bool intel_hdcp_gsc_check_status(struct intel_display *display) 
	if (!xe_gsc_proxy_init_done(gsc))

		ret = false;



	xe_force_wake_put(gt_to_fw(gt), XE_FW_GSC);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);

out:

	xe_pm_runtime_put(xe);

	return ret;

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

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ 
#define   HUC_LOADING_AGENT_GUC			REG_BIT(1)

#define   GUC_WOPCM_OFFSET_VALID		REG_BIT(0)

#define GUC_MAX_IDLE_COUNT			XE_REG(0xc3e4)

#define GUC_PMTIMESTAMP				XE_REG(0xc3e8)

#define GUC_PMTIMESTAMP_LO			XE_REG(0xc3e8)

#define GUC_PMTIMESTAMP_HI			XE_REG(0xc3ec)



#define GUC_SEND_INTERRUPT			XE_REG(0xc4c8)

#define   GUC_SEND_TRIGGER			REG_BIT(0)

drivers/gpu/drm/xe/tests/xe_mocs.c

+8 −10
Original line number Diff line number Diff line
@@ -43,12 +43,11 @@ static void read_l3cc_table(struct xe_gt *gt, 
{

	struct kunit *test = kunit_get_current_test();

	u32 l3cc, l3cc_expected;

	unsigned int i;

	unsigned int fw_ref, i;

	u32 reg_val;

	u32 ret;



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

	KUNIT_ASSERT_EQ_MSG(test, ret, 0, "Forcewake Failed.\n");

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

	KUNIT_ASSERT_NE_MSG(test, fw_ref, 0, "Forcewake Failed.\n");



	for (i = 0; i < info->num_mocs_regs; i++) {

		if (!(i & 1)) {
@@ -72,7 +71,7 @@ static void read_l3cc_table(struct xe_gt *gt, 
		KUNIT_EXPECT_EQ_MSG(test, l3cc_expected, l3cc,

				    "l3cc idx=%u has incorrect val.\n", i);

	}

	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);

}



static void read_mocs_table(struct xe_gt *gt,
@@ -80,15 +79,14 @@ static void read_mocs_table(struct xe_gt *gt, 
{

	struct kunit *test = kunit_get_current_test();

	u32 mocs, mocs_expected;

	unsigned int i;

	unsigned int fw_ref, i;

	u32 reg_val;

	u32 ret;



	KUNIT_EXPECT_TRUE_MSG(test, info->unused_entries_index,

			      "Unused entries index should have been defined\n");



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

	KUNIT_ASSERT_EQ_MSG(test, ret, 0, "Forcewake Failed.\n");

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

	KUNIT_ASSERT_NE_MSG(test, fw_ref, 0, "Forcewake Failed.\n");



	for (i = 0; i < info->num_mocs_regs; i++) {

		if (regs_are_mcr(gt))
@@ -106,7 +104,7 @@ static void read_mocs_table(struct xe_gt *gt, 
				    "mocs reg 0x%x has incorrect val.\n", i);

	}



	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);

}



static int mocs_kernel_test_run_device(struct xe_device *xe)

drivers/gpu/drm/xe/xe_debugfs.c

+23 −4
Original line number Diff line number Diff line
@@ -90,13 +90,32 @@ static int forcewake_open(struct inode *inode, struct file *file) 
{

	struct xe_device *xe = inode->i_private;

	struct xe_gt *gt;

	u8 id;

	u8 id, last_gt;

	unsigned int fw_ref;



	xe_pm_runtime_get(xe);

	for_each_gt(gt, xe, id)

		XE_WARN_ON(xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL));

	for_each_gt(gt, xe, id) {

		last_gt = id;



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

		if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL))

			goto err_fw_get;

	}



	return 0;



err_fw_get:

	for_each_gt(gt, xe, id) {

		if (id < last_gt)

			xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);

		else if (id == last_gt)

			xe_force_wake_put(gt_to_fw(gt), fw_ref);

		else

			break;

	}



	xe_pm_runtime_put(xe);

	return -ETIMEDOUT;

}



static int forcewake_release(struct inode *inode, struct file *file)
@@ -106,7 +125,7 @@ static int forcewake_release(struct inode *inode, struct file *file) 
	u8 id;



	for_each_gt(gt, xe, id)

		XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));

		xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	xe_pm_runtime_put(xe);



	return 0;