Merge tag 'topic/step-2026-04-09' of https://gitlab.freedesktop.org/drm/i915/kernel...

topic/step to unify xe and i915 on common steppings header and enum

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/cc1ff0a476ff457e88251e22b83c1a45ada11ecc@intel.com

diff --cc drivers/gpu/drm/i915/display/intel_cdclk.c
index 8feba2e0333b0cef6d13bb23eddf177f4020da2f,e3b044ee3e1628350e68ee8d1e32d6bfb91b6c6a..57d714c81fc4279356fee28bbaeb3e926f4a3e59
--- 1/drivers/gpu/drm/i915/display/intel_cdclk.c
--- 2/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@@ -28,7 -28,7 +28,8 @@@
  #include <drm/drm_fixed.h>
  #include <drm/drm_print.h>
  #include <drm/intel/intel_pcode_regs.h>
 +#include <drm/intel/pci_config.h>
+ #include <drm/intel/step.h>
  
  #include "hsw_ips.h"
  #include "intel_atomic.h"
@@@ -42,11 -42,11 +43,10 @@@
  #include "intel_display_utils.h"
  #include "intel_display_wa.h"
  #include "intel_dram.h"
 -#include "intel_mchbar_regs.h"
 +#include "intel_mchbar.h"
  #include "intel_parent.h"
 -#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 --cc drivers/gpu/drm/i915/display/intel_display_power.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_psr.c
Simple merge