github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/display: switch to including common step file directly

Browse Source 
Instead of using the proxy intel_step.h in display, just include the
common step file directly where needed. This allows us to remove the
compat intel_step.h header.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://patch.msgid.link/83b5f13b7f863b9cbc61499bcff22af5cd822a0b.1774875688.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2026-03-30 16:02:36 +03:00
parent 90788699d8
commit baf310b983
14 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_cdclk.c
View File

@ -28,6 +28,7 @@
#include <drm/drm_fixed.h>
#include <drm/drm_print.h>
#include <drm/intel/intel_pcode_regs.h>
#include <drm/intel/step.h>
#include "hsw_ips.h"
#include "intel_atomic.h"
@ -46,7 +47,6 @@
#include "intel_pci_config.h"
#include "intel_plane.h"
#include "intel_psr.h"
#include "intel_step.h"
#include "intel_vdsc.h"
#include "skl_watermark.h"
#include "skl_watermark_regs.h"

2
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@ -33,6 +33,7 @@
#include <drm/display/drm_scdc_helper.h>
#include <drm/drm_print.h>
#include <drm/drm_privacy_screen_consumer.h>
#include <drm/intel/step.h>
#include "icl_dsi.h"
#include "intel_alpm.h"
@ -81,7 +82,6 @@
#include "intel_psr.h"
#include "intel_quirks.h"
#include "intel_snps_phy.h"
#include "intel_step.h"
#include "intel_tc.h"
#include "intel_vdsc.h"
#include "intel_vdsc_regs.h"

2
drivers/gpu/drm/i915/display/intel_display_device.c
View File

@ -9,6 +9,7 @@
#include <drm/drm_drv.h>
#include <drm/drm_print.h>
#include <drm/intel/pciids.h>
#include <drm/intel/step.h>
#include "intel_cx0_phy_regs.h"
#include "intel_de.h"
@ -21,7 +22,6 @@
#include "intel_display_types.h"
#include "intel_display_wa.h"
#include "intel_fbc.h"
#include "intel_step.h"
__diag_push();
__diag_ignore_all("-Woverride-init", "Allow field initialization overrides for display info");

2
drivers/gpu/drm/i915/display/intel_display_power.c
View File

@ -8,6 +8,7 @@
#include <drm/drm_print.h>
#include <drm/intel/intel_pcode_regs.h>
#include <drm/intel/step.h>
#include "intel_backlight_regs.h"
#include "intel_cdclk.h"
@ -30,7 +31,6 @@
#include "intel_pmdemand.h"
#include "intel_pps_regs.h"
#include "intel_snps_phy.h"
#include "intel_step.h"
#include "skl_watermark.h"
#include "skl_watermark_regs.h"
#include "vlv_sideband.h"

2
drivers/gpu/drm/i915/display/intel_display_wa.c
View File

@ -4,12 +4,12 @@
*/
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_de.h"
#include "intel_display_core.h"
#include "intel_display_regs.h"
#include "intel_display_wa.h"
#include "intel_step.h"
static void gen11_display_wa_apply(struct intel_display *display)
{

2
drivers/gpu/drm/i915/display/intel_dp_mst.c
View File

@ -32,6 +32,7 @@
#include <drm/drm_fixed.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include <drm/intel/step.h>
#include "intel_atomic.h"
#include "intel_audio.h"
@ -56,7 +57,6 @@
#include "intel_link_bw.h"
#include "intel_pfit.h"
#include "intel_psr.h"
#include "intel_step.h"
#include "intel_vdsc.h"
#include "intel_vrr.h"
#include "skl_scaler.h"

2
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
View File

@ -25,6 +25,7 @@
#include <linux/string_helpers.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "bxt_dpio_phy_regs.h"
#include "intel_cx0_phy.h"
@ -41,7 +42,6 @@
#include "intel_lt_phy.h"
#include "intel_mg_phy_regs.h"
#include "intel_pch_refclk.h"
#include "intel_step.h"
#include "intel_tc.h"
/**

2
drivers/gpu/drm/i915/display/intel_fbc.c
View File

@ -44,6 +44,7 @@
#include <drm/drm_blend.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "i9xx_plane_regs.h"
#include "intel_de.h"
@ -58,7 +59,6 @@
#include "intel_fbc_regs.h"
#include "intel_frontbuffer.h"
#include "intel_parent.h"
#include "intel_step.h"
#define for_each_fbc_id(__display, __fbc_id) \
for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \

2
drivers/gpu/drm/i915/display/intel_flipq.c
View File

@ -6,6 +6,7 @@
#include <linux/pci.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_crtc.h"
#include "intel_de.h"
@ -17,7 +18,6 @@
#include "intel_dmc_regs.h"
#include "intel_dsb.h"
#include "intel_flipq.h"
#include "intel_step.h"
#include "intel_vblank.h"
#include "intel_vrr.h"

2
drivers/gpu/drm/i915/display/intel_hdcp.c
View File

@ -18,6 +18,7 @@
#include <drm/drm_print.h>
#include <drm/intel/i915_component.h>
#include <drm/intel/intel_pcode_regs.h>
#include <drm/intel/step.h>
#include "intel_connector.h"
#include "intel_de.h"
@ -33,7 +34,6 @@
#include "intel_hdcp_regs.h"
#include "intel_hdcp_shim.h"
#include "intel_parent.h"
#include "intel_step.h"
#define USE_HDCP_GSC(__display) (DISPLAY_VER(__display) >= 14)

2
drivers/gpu/drm/i915/display/intel_pmdemand.c
View File

@ -6,6 +6,7 @@
#include <linux/bitops.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_atomic.h"
#include "intel_bw.h"
@ -17,7 +18,6 @@
#include "intel_display_utils.h"
#include "intel_display_wa.h"
#include "intel_pmdemand.h"
#include "intel_step.h"
#include "skl_watermark.h"
struct pmdemand_params {

2
drivers/gpu/drm/i915/display/intel_psr.c
View File

@ -28,6 +28,7 @@
#include <drm/drm_debugfs.h>
#include <drm/drm_print.h>
#include <drm/drm_vblank.h>
#include <drm/intel/step.h>
#include "intel_alpm.h"
#include "intel_atomic.h"
@ -51,7 +52,6 @@
#include "intel_psr_regs.h"
#include "intel_quirks.h"
#include "intel_snps_phy.h"
#include "intel_step.h"
#include "intel_vblank.h"
#include "intel_vdsc.h"
#include "intel_vrr.h"

2
drivers/gpu/drm/i915/display/skl_universal_plane.c
View File

@ -8,6 +8,7 @@
#include <drm/drm_damage_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_bo.h"
#include "intel_color.h"
@ -25,7 +26,6 @@
#include "intel_plane.h"
#include "intel_psr.h"
#include "intel_psr_regs.h"
#include "intel_step.h"
#include "skl_scaler.h"
#include "skl_universal_plane.h"
#include "skl_universal_plane_regs.h"

11
drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
View File

@ -1,11 +0,0 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2023 Intel Corporation
*/
#ifndef __INTEL_STEP_H__
#define __INTEL_STEP_H__
#include <drm/intel/step.h>
#endif /* __INTEL_STEP_H__ */