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 <jfale...@redhat.com> Cc: Maarten Lankhorst <d...@lankhorst.se> Signed-off-by: Jani Nikula <jani.nik...@intel.com> --- drivers/gpu/drm/i915/display/intel_panic.c | 4 ++-- drivers/gpu/drm/i915/display/intel_panic.h | 4 ++-- drivers/gpu/drm/i915/display/intel_plane.c | 4 ++-- drivers/gpu/drm/xe/display/xe_panic.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_panic.c b/drivers/gpu/drm/i915/display/intel_panic.c index 9eae210bb4cd..20eecb0f168f 100644 --- 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 index 07e72240cbd7..67ce253fcdf5 100644 --- 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 index a467e14e6388..890d897bda10 100644 --- 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 index 14fba8aa4e5f..18b27a06b260 100644 --- 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); -- 2.47.2