On Wed, 2026-03-04 at 16:40 +0200, Jani Nikula wrote: > 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. > > Signed-off-by: Jani Nikula <[email protected]> > ---
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca. > drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- > drivers/gpu/drm/i915/display/intel_display_device.c | 2 +- > drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/intel_flipq.c | 2 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- > drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- > drivers/gpu/drm/i915/display/intel_psr.c | 2 +- > drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- > drivers/gpu/drm/xe/compat-i915-headers/intel_step.h | 11 ----------- > 13 files changed, 12 insertions(+), 23 deletions(-) > delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c > b/drivers/gpu/drm/i915/display/intel_cdclk.c > index 38331e899519..fcee3b1bfdcc 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -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" > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 94ae583e907f..b4c84528ce5c 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -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" > @@ -80,7 +81,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" > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c > b/drivers/gpu/drm/i915/display/intel_display_device.c > index f716e9a51532..361a2fca58a3 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > @@ -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" > @@ -20,7 +21,6 @@ > #include "intel_display_regs.h" > #include "intel_display_types.h" > #include "intel_fbc.h" > -#include "intel_step.h" > > __diag_push(); > __diag_ignore_all("-Woverride-init", "Allow field initialization overrides > for display info"); > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c > b/drivers/gpu/drm/i915/display/intel_display_power.c > index 755935dcfe23..fa76a3ed6559 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -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" > @@ -29,7 +30,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" > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 0bb39f9bd74e..262fd2ed278e 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -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" > @@ -55,7 +56,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" > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > index f35a9252f4e1..908a90804881 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > @@ -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" > > /** > diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c > b/drivers/gpu/drm/i915/display/intel_fbc.c > index 3e9b3e532499..a9de9fe6fa28 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbc.c > +++ b/drivers/gpu/drm/i915/display/intel_fbc.c > @@ -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)++) \ > diff --git a/drivers/gpu/drm/i915/display/intel_flipq.c > b/drivers/gpu/drm/i915/display/intel_flipq.c > index 1e9550cb66a3..d2c69a666f0b 100644 > --- a/drivers/gpu/drm/i915/display/intel_flipq.c > +++ b/drivers/gpu/drm/i915/display/intel_flipq.c > @@ -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" > @@ -16,7 +17,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" > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 116d2e0af878..6e86d97f8ea9 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -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) > > diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c > b/drivers/gpu/drm/i915/display/intel_pmdemand.c > index f3db55710010..a41ff04a183c 100644 > --- a/drivers/gpu/drm/i915/display/intel_pmdemand.c > +++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c > @@ -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" > @@ -16,7 +17,6 @@ > #include "intel_display_trace.h" > #include "intel_display_utils.h" > #include "intel_pmdemand.h" > -#include "intel_step.h" > #include "skl_watermark.h" > > struct pmdemand_params { > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index 9296ca3a4ff4..a38d872dcb80 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -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" > @@ -49,7 +50,6 @@ > #include "intel_psr.h" > #include "intel_psr_regs.h" > #include "intel_snps_phy.h" > -#include "intel_step.h" > #include "intel_vblank.h" > #include "intel_vdsc.h" > #include "intel_vrr.h" > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c > b/drivers/gpu/drm/i915/display/skl_universal_plane.c > index 677f1339b7f8..91e2950c3741 100644 > --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c > +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c > @@ -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" > @@ -24,7 +25,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" > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > b/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > deleted file mode 100644 > index cb55a659856b..000000000000 > --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > +++ /dev/null > @@ -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__ */
