From d6b80e904bb00a188d9a59be6bf7e19b89e3954f Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 11 Dec 2025 19:37:11 +0200 Subject: drm/i915/panic: move i915 specific panic implementation to i915 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intel_panic.c implementation is i915 specific, and xe has its own. Move it to i915 core as i915_panic.c. Reviewed-by: Ville Syrjälä Link: https://patch.msgid.link/8dc7af0ae1f859d17b0be269a545146c5536d8fc.1765474612.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/Makefile | 4 ++-- drivers/gpu/drm/i915/display/intel_panic.c | 27 --------------------------- drivers/gpu/drm/i915/i915_panic.c | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.c create mode 100644 drivers/gpu/drm/i915/i915_panic.c diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index ca5c69d1cb08..13b9e71fa993 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -76,7 +76,8 @@ i915-$(CONFIG_PERF_EVENTS) += \ # core display adaptation i915-y += \ - i915_hdcp_gsc.o + i915_hdcp_gsc.o \ + i915_panic.o # "Graphics Technology" (aka we talk to the gpu) gt-y += \ @@ -294,7 +295,6 @@ i915-y += \ display/intel_modeset_setup.o \ display/intel_modeset_verify.o \ display/intel_overlay.o \ - display/intel_panic.o \ display/intel_parent.o \ display/intel_pch.o \ display/intel_pch_display.o \ diff --git a/drivers/gpu/drm/i915/display/intel_panic.c b/drivers/gpu/drm/i915/display/intel_panic.c deleted file mode 100644 index 7311ce4e8b6c..000000000000 --- a/drivers/gpu/drm/i915/display/intel_panic.c +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: MIT -/* Copyright © 2025 Intel Corporation */ - -#include - -#include "gem/i915_gem_object.h" -#include "intel_display_types.h" -#include "intel_fb.h" -#include "intel_panic.h" - -struct intel_panic *intel_panic_alloc(void) -{ - return i915_gem_object_alloc_panic(); -} - -int intel_panic_setup(struct intel_panic *panic, struct drm_scanout_buffer *sb) -{ - struct intel_framebuffer *fb = sb->private; - struct drm_gem_object *obj = intel_fb_bo(&fb->base); - - return i915_gem_object_panic_setup(panic, sb, obj, fb->panic_tiling); -} - -void intel_panic_finish(struct intel_panic *panic) -{ - return i915_gem_object_panic_finish(panic); -} diff --git a/drivers/gpu/drm/i915/i915_panic.c b/drivers/gpu/drm/i915/i915_panic.c new file mode 100644 index 000000000000..028ff83b2519 --- /dev/null +++ b/drivers/gpu/drm/i915/i915_panic.c @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: MIT +/* Copyright © 2025 Intel Corporation */ + +#include + +#include "display/intel_display_types.h" +#include "display/intel_fb.h" +#include "display/intel_panic.h" +#include "gem/i915_gem_object.h" + +struct intel_panic *intel_panic_alloc(void) +{ + return i915_gem_object_alloc_panic(); +} + +int intel_panic_setup(struct intel_panic *panic, struct drm_scanout_buffer *sb) +{ + struct intel_framebuffer *fb = sb->private; + struct drm_gem_object *obj = intel_fb_bo(&fb->base); + + return i915_gem_object_panic_setup(panic, sb, obj, fb->panic_tiling); +} + +void intel_panic_finish(struct intel_panic *panic) +{ + return i915_gem_object_panic_finish(panic); +} -- cgit v1.2.3