drm/{i915,xe}: Move intel_pch under display

The only usage of the "PCH" infra is to detect which South Display
Engine we should be using. Move it under display so we can convert
all its callers towards intel_display struct later.

No functional or code change.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/041e3dee494aa15c22172360f2bdd9b15e4acb00.1744364975.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 c8fc271b33b773a7b401ed5242f59b6bb460142a..13d4a16f7d33ae992179ed572f0bd2d0bb128da8 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -52,7 +52,6 @@ i915-y += \
 i915-y += \
        soc/intel_dram.o \
        soc/intel_gmch.o \
-       soc/intel_pch.o \
        soc/intel_rom.o
 
 # core library code
@@ -282,6 +281,7 @@ i915-y += \
        display/intel_modeset_setup.o \
        display/intel_modeset_verify.o \
        display/intel_overlay.o \
+       display/intel_pch.o \
        display/intel_pch_display.o \
        display/intel_pch_refclk.o \
        display/intel_plane_initial.o \

diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/display/intel_pch.c
similarity index 99%
rename from drivers/gpu/drm/i915/soc/intel_pch.c
rename to drivers/gpu/drm/i915/display/intel_pch.c
index 82dc7fbd1a3e9213a618b9581bf7cea3bee78d81..37766e40fd1cdfe4a9de75ea4e1e4d7202ec5433 100644 (file)
--- a/drivers/gpu/drm/i915/soc/intel_pch.c
+++ b/drivers/gpu/drm/i915/display/intel_pch.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 /*
- * Copyright 2019 Intel Corporation.
+ * Copyright 2025 Intel Corporation.
  */
 
 #include "i915_drv.h"

diff --git a/drivers/gpu/drm/i915/soc/intel_pch.h b/drivers/gpu/drm/i915/display/intel_pch.h
similarity index 98%
rename from drivers/gpu/drm/i915/soc/intel_pch.h
rename to drivers/gpu/drm/i915/display/intel_pch.h
index 635aea7a5539da7fc4eff850655f5377c3aa47a7..b9fa2b2f07bcef14f582a0c4ce57b7be459f2f83 100644 (file)
--- a/drivers/gpu/drm/i915/soc/intel_pch.h
+++ b/drivers/gpu/drm/i915/display/intel_pch.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT */
 /*
- * Copyright 2019 Intel Corporation.
+ * Copyright 2025 Intel Corporation.
  */
 
 #ifndef __INTEL_PCH__

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 236c48d282e4741e2934862fc16a87d4a6b3f83e..65e795a4ecbab5600549672ef1fc558713e4e596 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -38,6 +38,7 @@
 
 #include "display/intel_display_limits.h"
 #include "display/intel_display_core.h"
+#include "display/intel_pch.h"
 
 #include "gem/i915_gem_context_types.h"
 #include "gem/i915_gem_shrinker.h"
@@ -49,8 +50,6 @@
 #include "gt/intel_workarounds.h"
 #include "gt/uc/intel_uc.h"
 
-#include "soc/intel_pch.h"
-
 #include "i915_drm_client.h"
 #include "i915_gem.h"
 #include "i915_gpu_error.h"

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 4a99568605bd8df9d6f7d33346833bc5f93c0b5f..e4d16e7a1b12d735e48191bc5cef95447858c62f 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -193,7 +193,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 # SOC code shared with i915
 xe-$(CONFIG_DRM_XE_DISPLAY) += \
        i915-soc/intel_dram.o \
-       i915-soc/intel_pch.o \
        i915-soc/intel_rom.o
 
 # Display code shared with i915
@@ -268,6 +267,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
        i915-display/intel_panel.o \
        i915-display/intel_pfit.o \
        i915-display/intel_pmdemand.o \
+       i915-display/intel_pch.o \
        i915-display/intel_pps.o \
        i915-display/intel_psr.o \
        i915-display/intel_qp_tables.o \

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h b/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h
deleted file mode 100644 (file)
index 9c46556..0000000
--- a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#include "../../../i915/soc/intel_pch.h"

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 50a1579bb18e0086c27f08557f8be890cb0ed706..23bcb0ee7afd578ff0645d79e88de56181d8e04e 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -30,7 +30,7 @@
 #endif
 
 #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
-#include "soc/intel_pch.h"
+#include "intel_pch.h"
 #include "intel_display_core.h"
 #include "intel_display_device.h"
 #endif