The intel_panic.c implementation is i915 specific, and xe has its own. Move it to i915 core as i915_panic.c.
Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/Makefile | 4 ++-- .../gpu/drm/i915/{display/intel_panic.c => i915_panic.c} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename drivers/gpu/drm/i915/{display/intel_panic.c => i915_panic.c} (84%) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 175bd99e1d0d..f01b5d8a07c7 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 += \ @@ -293,7 +294,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 7311ce4e8b6c..028ff83b2519 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) { -- 2.47.3
