Merge tag 'drm-intel-fixes-2026-01-15' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

airlied · airlied · commit 85807edac851 · 2026-01-16T15:45:41.000+10:00
drm/i915 fixes for v6.19-rc6: - make 'guc_hw_reg_state' static Signed-off-by: Dave Airlie <airlied@redhat.com> From: Jani Nikula <jani.nikula@intel.com> Link: https://patch.msgid.link/65bb05f7c8cbd3faf2350f979d4d47a395e5d372@intel.com
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -686,7 +686,7 @@ static void err_print_guc_ctb(struct drm_i915_error_state_buf *m,
 }
 
 /* This list includes registers that are useful in debugging GuC hangs. */
-const struct {
+static const struct {
 	u32 start;
 	u32 count;
 } guc_hw_reg_state[] = {

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ static void err_print_guc_ctb(struct drm_i915_error_state_buf *m,`
`686`	`686`	`}`
`687`	`687`
`688`	`688`	`/* This list includes registers that are useful in debugging GuC hangs. */`
`689`		`-const struct {`
	`689`	`+static const struct {`
`690`	`690`	`u32 start;`
`691`	`691`	`u32 count;`
`692`	`692`	`} guc_hw_reg_state[] = {`