github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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>
This commit is contained in:
Rodrigo Vivi 2025-04-11 12:54:11 +03:00 committed by Jani Nikula
parent 1954629dc6
commit 6ca37b86f6
7 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/Makefile
View File

@ -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 \

2
drivers/gpu/drm/i915/soc/intel_pch.c → drivers/gpu/drm/i915/display/intel_pch.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT
/*
* Copyright 2019 Intel Corporation.
* Copyright 2025 Intel Corporation.
*/
#include "i915_drv.h"

2
drivers/gpu/drm/i915/soc/intel_pch.h → drivers/gpu/drm/i915/display/intel_pch.h
View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright 2019 Intel Corporation.
* Copyright 2025 Intel Corporation.
*/
#ifndef __INTEL_PCH__

3
drivers/gpu/drm/i915/i915_drv.h
View File

@ -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"

2
drivers/gpu/drm/xe/Makefile
View File

@ -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 \

6
drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h
View File

@ -1,6 +0,0 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2023 Intel Corporation
*/
#include "../../../i915/soc/intel_pch.h"

2
drivers/gpu/drm/xe/xe_device_types.h
View File

@ -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