From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Nov 2024 04:25:33 +0000 (+1000)
Subject: Backmerge v6.12-rc6 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v6.13-rc1~122^2~12
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/30169bb64580bd7bce9290c1952bf0aa6cc37fe5

Backmerge v6.12-rc6 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Backmerge Linus tree for some drm-fixes needed for msm and xe merges.

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

30169bb64580bd7bce9290c1952bf0aa6cc37fe5
diff --cc drivers/accel/ivpu/ivpu_debugfs.c
index 8958145c49ad,8d50981594d1..8180b95ed69d
--- a/drivers/accel/ivpu/ivpu_debugfs.c
+++ b/drivers/accel/ivpu/ivpu_debugfs.c
@@@ -125,25 -124,35 +133,26 @@@ static const struct drm_debugfs_info vd
  	{"last_bootmode", last_bootmode_show, 0},
  	{"reset_counter", reset_counter_show, 0},
  	{"reset_pending", reset_pending_show, 0},
+ 	{"firewall_irq_counter", firewall_irq_counter_show, 0},
  };
  
 -static ssize_t
 -dvfs_mode_fops_write(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)
 +static int dvfs_mode_get(void *data, u64 *dvfs_mode)
  {
 -	struct ivpu_device *vdev = file->private_data;
 -	struct ivpu_fw_info *fw = vdev->fw;
 -	u32 dvfs_mode;
 -	int ret;
 -
 -	ret = kstrtou32_from_user(user_buf, size, 0, &dvfs_mode);
 -	if (ret < 0)
 -		return ret;
 +	struct ivpu_device *vdev = (struct ivpu_device *)data;
  
 -	fw->dvfs_mode = dvfs_mode;
 +	*dvfs_mode = vdev->fw->dvfs_mode;
 +	return 0;
 +}
  
 -	ret = pci_try_reset_function(to_pci_dev(vdev->drm.dev));
 -	if (ret)
 -		return ret;
 +static int dvfs_mode_set(void *data, u64 dvfs_mode)
 +{
 +	struct ivpu_device *vdev = (struct ivpu_device *)data;
  
 -	return size;
 +	vdev->fw->dvfs_mode = (u32)dvfs_mode;
 +	return pci_try_reset_function(to_pci_dev(vdev->drm.dev));
  }
  
 -static const struct file_operations dvfs_mode_fops = {
 -	.owner = THIS_MODULE,
 -	.open = simple_open,
 -	.write = dvfs_mode_fops_write,
 -};
 +DEFINE_DEBUGFS_ATTRIBUTE(dvfs_mode_fops, dvfs_mode_get, dvfs_mode_set, "%llu\n");
  
  static ssize_t
  fw_dyndbg_fops_write(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)
diff --cc drivers/gpu/drm/xe/xe_ggtt.c
index 1b3178226987,ff19eca5d358..65bc41d2c867
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@@ -401,6 -397,16 +401,16 @@@ static void ggtt_invalidate_gt_tlb(stru
  
  static void xe_ggtt_invalidate(struct xe_ggtt *ggtt)
  {
+ 	struct xe_device *xe = tile_to_xe(ggtt->tile);
+ 
+ 	/*
+ 	 * XXX: Barrier for GGTT pages. Unsure exactly why this required but
+ 	 * without this LNL is having issues with the GuC reading scratch page
+ 	 * vs. correct GGTT page. Not particularly a hot code path so blindly
+ 	 * do a mmio read here which results in GuC reading correct GGTT page.
+ 	 */
 -	xe_mmio_read32(xe_root_mmio_gt(xe), VF_CAP_REG);
++	xe_mmio_read32(&xe_root_mmio_gt(xe)->mmio, VF_CAP_REG);
+ 
  	/* Each GT in a tile has its own TLB to cache GGTT lookups */
  	ggtt_invalidate_gt_tlb(ggtt->tile->primary_gt);
  	ggtt_invalidate_gt_tlb(ggtt->tile->media_gt);
diff --cc drivers/gpu/drm/xe/xe_guc_submit.c
index 0e5649b394b6,f903b0772722..5f8c7a45b028
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@@ -1124,25 -1059,6 +1061,21 @@@ guc_exec_queue_timedout_job(struct drm_
  		exec_queue_killed_or_banned_or_wedged(q) ||
  		exec_queue_destroyed(q);
  
- 	/* Job hasn't started, can't be timed out */
- 	if (!skip_timeout_check && !xe_sched_job_started(job))
- 		goto rearm;
- 
 +	/*
 +	 * If devcoredump not captured and GuC capture for the job is not ready
 +	 * do manual capture first and decide later if we need to use it
 +	 */
 +	if (!exec_queue_killed(q) && !xe->devcoredump.captured &&
 +	    !xe_guc_capture_get_matching_and_lock(job)) {
 +		/* take force wake before engine register manual capture */
 +		if (xe_force_wake_get(gt_to_fw(q->gt), XE_FORCEWAKE_ALL))
 +			xe_gt_info(q->gt, "failed to get forcewake for coredump capture\n");
 +
 +		xe_engine_snapshot_capture_for_job(job);
 +
 +		xe_force_wake_put(gt_to_fw(q->gt), XE_FORCEWAKE_ALL);
 +	}
 +
  	/*
  	 * XXX: Sampling timeout doesn't work in wedged mode as we have to
  	 * modify scheduling state to read timestamp. We could read the