drm/{i915,xe}/panic: rename intel_bo_panic_*() to intel_panic_*()

jnikula · jnikula · commit 05a85e781ff0 · 2025-09-08T14:23:46.000+03:00
Rename the intel_bo_panic_*() functions according to the functionality, dropping the misleading intel_bo reference. Keep intel_bo_alloc_framebuffer() for now; it'll be refactored later. Cc: Jocelyn Falempe <jfalempe@redhat.com> Cc: Maarten Lankhorst <dev@lankhorst.se> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> Link: https://lore.kernel.org/r/a3be8f8b5e7dd208027a1131e89452d9a214054f.1756835342.git.jani.nikula@intel.com
diff --git a/drivers/gpu/drm/i915/display/intel_panic.c b/drivers/gpu/drm/i915/display/intel_panic.c
@@ -9,12 +9,12 @@ struct intel_framebuffer *intel_bo_alloc_framebuffer(void)
 	return i915_gem_object_alloc_framebuffer();
 }
 
-int intel_bo_panic_setup(struct drm_scanout_buffer *sb)
+int intel_panic_setup(struct drm_scanout_buffer *sb)
 {
 	return i915_gem_object_panic_setup(sb);
 }
 
-void intel_bo_panic_finish(struct intel_framebuffer *fb)
+void intel_panic_finish(struct intel_framebuffer *fb)
 {
 	return i915_gem_object_panic_finish(fb);
 }
diff --git a/drivers/gpu/drm/i915/display/intel_panic.h b/drivers/gpu/drm/i915/display/intel_panic.h
@@ -8,7 +8,7 @@ struct drm_scanout_buffer;
 struct intel_framebuffer;
 
 struct intel_framebuffer *intel_bo_alloc_framebuffer(void);
-int intel_bo_panic_setup(struct drm_scanout_buffer *sb);
-void intel_bo_panic_finish(struct intel_framebuffer *fb);
+int intel_panic_setup(struct drm_scanout_buffer *sb);
+void intel_panic_finish(struct intel_framebuffer *fb);
 
 #endif /* __INTEL_PANIC_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -1326,7 +1326,7 @@ static void intel_panic_flush(struct drm_plane *plane)
 	struct drm_framebuffer *fb = plane_state->hw.fb;
 	struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
 
-	intel_bo_panic_finish(intel_fb);
+	intel_panic_finish(intel_fb);
 
 	if (crtc_state->enable_psr2_sel_fetch) {
 		/* Force a full update for psr2 */
@@ -1409,7 +1409,7 @@ static int intel_get_scanout_buffer(struct drm_plane *plane,
 				return -EOPNOTSUPP;
 		}
 		sb->private = intel_fb;
-		ret = intel_bo_panic_setup(sb);
+		ret = intel_panic_setup(sb);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/xe/display/xe_panic.c b/drivers/gpu/drm/xe/display/xe_panic.c
@@ -77,7 +77,7 @@ struct intel_framebuffer *intel_bo_alloc_framebuffer(void)
 	return NULL;
 }
 
-int intel_bo_panic_setup(struct drm_scanout_buffer *sb)
+int intel_panic_setup(struct drm_scanout_buffer *sb)
 {
 	struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
 	struct xe_panic_data *panic = to_xe_panic_data(fb);
@@ -87,7 +87,7 @@ int intel_bo_panic_setup(struct drm_scanout_buffer *sb)
 	return 0;
 }
 
-void intel_bo_panic_finish(struct intel_framebuffer *fb)
+void intel_panic_finish(struct intel_framebuffer *fb)
 {
 	struct xe_panic_data *panic = to_xe_panic_data(fb);
 

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ struct intel_framebuffer *intel_bo_alloc_framebuffer(void)`
`9`	`9`	`return i915_gem_object_alloc_framebuffer();`
`10`	`10`	`}`
`11`	`11`
`12`		`-int intel_bo_panic_setup(struct drm_scanout_buffer *sb)`
	`12`	`+int intel_panic_setup(struct drm_scanout_buffer *sb)`
`13`	`13`	`{`
`14`	`14`	`return i915_gem_object_panic_setup(sb);`
`15`	`15`	`}`
`16`	`16`
`17`		`-void intel_bo_panic_finish(struct intel_framebuffer *fb)`
	`17`	`+void intel_panic_finish(struct intel_framebuffer *fb)`
`18`	`18`	`{`
`19`	`19`	`return i915_gem_object_panic_finish(fb);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ struct intel_framebuffer *intel_bo_alloc_framebuffer(void)`
`77`	`77`	`return NULL;`
`78`	`78`	`}`
`79`	`79`
`80`		`-int intel_bo_panic_setup(struct drm_scanout_buffer *sb)`
	`80`	`+int intel_panic_setup(struct drm_scanout_buffer *sb)`
`81`	`81`	`{`
`82`	`82`	`struct intel_framebuffer fb = (struct intel_framebuffer )sb->private;`
`83`	`83`	`struct xe_panic_data *panic = to_xe_panic_data(fb);`
`@@ -87,7 +87,7 @@ int intel_bo_panic_setup(struct drm_scanout_buffer *sb)`
`87`	`87`	`return 0;`
`88`	`88`	`}`
`89`	`89`
`90`		`-void intel_bo_panic_finish(struct intel_framebuffer *fb)`
	`90`	`+void intel_panic_finish(struct intel_framebuffer *fb)`
`91`	`91`	`{`
`92`	`92`	`struct xe_panic_data *panic = to_xe_panic_data(fb);`
`93`	`93`