From: jsg <jsg@openbsd.org>
Date: Fri, 31 Mar 2023 01:42:14 +0000 (+0000)
Subject: drm/i915/guc: Rename GuC register state capture node to be more obvious
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=41b6a0afdbfedf5b5e7778f1f84cbef908ed8efd;p=openbsd

drm/i915/guc: Rename GuC register state capture node to be more obvious

From John Harrison
d2b9357d3da3f8054a47eef04c8ef361608b243e in linux-6.1.y/6.1.22
583ebae783b8241a30581c084ad6226051b594c5 in mainline linux
---

diff --git a/sys/dev/pci/drm/i915/gt/uc/intel_guc_capture.c b/sys/dev/pci/drm/i915/gt/uc/intel_guc_capture.c
index 685ddccc0f2..13118609339 100644
--- a/sys/dev/pci/drm/i915/gt/uc/intel_guc_capture.c
+++ b/sys/dev/pci/drm/i915/gt/uc/intel_guc_capture.c
@@ -1491,7 +1491,7 @@ int intel_guc_capture_print_engine_node(struct drm_i915_error_state_buf *ebuf,
 
 	if (!ebuf || !ee)
 		return -EINVAL;
-	cap = ee->capture;
+	cap = ee->guc_capture;
 	if (!cap || !ee->engine)
 		return -ENODEV;
 
@@ -1561,8 +1561,8 @@ void intel_guc_capture_free_node(struct intel_engine_coredump *ee)
 	if (!ee || !ee->guc_capture_node)
 		return;
 
-	guc_capture_add_node_to_cachelist(ee->capture, ee->guc_capture_node);
-	ee->capture = NULL;
+	guc_capture_add_node_to_cachelist(ee->guc_capture, ee->guc_capture_node);
+	ee->guc_capture = NULL;
 	ee->guc_capture_node = NULL;
 }
 
@@ -1596,7 +1596,7 @@ void intel_guc_capture_get_matching_node(struct intel_gt *gt,
 		    (ce->lrc.lrca & CTX_GTT_ADDRESS_MASK)) {
 			list_del(&n->link);
 			ee->guc_capture_node = n;
-			ee->capture = guc->capture;
+			ee->guc_capture = guc->capture;
 			return;
 		}
 	}
diff --git a/sys/dev/pci/drm/i915/i915_gpu_error.h b/sys/dev/pci/drm/i915/i915_gpu_error.h
index efc75cc2ffd..56027ffbce5 100644
--- a/sys/dev/pci/drm/i915/i915_gpu_error.h
+++ b/sys/dev/pci/drm/i915/i915_gpu_error.h
@@ -94,7 +94,7 @@ struct intel_engine_coredump {
 	struct intel_instdone instdone;
 
 	/* GuC matched capture-lists info */
-	struct intel_guc_state_capture *capture;
+	struct intel_guc_state_capture *guc_capture;
 	struct __guc_capture_parsed_output *guc_capture_node;
 
 	struct i915_gem_context_coredump {