Commit 6ca37b86 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Jani Nikula
Browse files

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/041e3dee494aa15c22172360f2bdd9b15e4acb00.1744364975.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 1954629d

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \

drivers/gpu/drm/i915/soc/intel_pch.c→drivers/gpu/drm/i915/display/intel_pch.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright 2019 Intel Corporation.

 * Copyright 2025 Intel Corporation.

 */



#include "i915_drv.h"

drivers/gpu/drm/i915/soc/intel_pch.h→drivers/gpu/drm/i915/display/intel_pch.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright 2019 Intel Corporation.

 * Copyright 2025 Intel Corporation.

 */



#ifndef __INTEL_PCH__

drivers/gpu/drm/i915/i915_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/xe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \