From: Jani Nikula <jani.nikula@intel.com>
Date: Thu, 11 Dec 2025 17:37:11 +0000 (+0200)
Subject: drm/i915/panic: move i915 specific panic implementation to i915
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b80e904bb00a188d9a59be6bf7e19b89e3954f;p=thirdparty%2Fkernel%2Flinux.git

drm/i915/panic: move i915 specific panic implementation to i915

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ä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/8dc7af0ae1f859d17b0be269a545146c5536d8fc.1765474612.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index ca5c69d1cb089..13b9e71fa9938 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/i915_panic.c
similarity index 84%
rename from drivers/gpu/drm/i915/display/intel_panic.c
rename to drivers/gpu/drm/i915/i915_panic.c
index 7311ce4e8b6c3..028ff83b25194 100644
--- a/drivers/gpu/drm/i915/display/intel_panic.c
+++ b/drivers/gpu/drm/i915/i915_panic.c
@@ -3,10 +3,10 @@
 
 #include <drm/drm_panic.h>
 
+#include "display/intel_display_types.h"
+#include "display/intel_fb.h"
+#include "display/intel_panic.h"
 #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)
 {