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

The GuC specific register state entry in the error capture object was
just called 'capture'. Although the companion 'node' entry was called
'guc_capture_node'. Rename the base entry to be 'guc_capture' instead
so that it is a) more consistent and b) more obvious what it is.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230127002842.3169194-9-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
index 1c1b850..fc3b994 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
@@ -1506,7 +1506,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;
 
@@ -1576,8 +1576,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;
 }
 
@@ -1611,7 +1611,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/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index efc75cc..56027ff 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/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 {