topic/step for i915 and xe
Hi Thomas, Matthew and Rodrigo -
Here's a topic pull intended for both drm-xe-next and drm-intel-next to unify the steppings header and enum between the i915 and xe drivers. I'm opting for a topic branch because merging this through either driver's -next branch would likely be painful conflicts wise.
Please pull this to drm-xe-next (*), and once you're done, I'll follow suit in drm-intel-next.
Thanks,
Jani.
(*) Hint, 'dim apply-pull drm-xe-next' on this message will do the
trick.
The following changes since commit 4516432284e1b2ad9e70de8067f779c9c1072189:
ttm/pool: track allocated_pages per numa node. (2026-04-08 06:52:48 +1000)
are available in the Git repository at:
https://gitlab.freedesktop.org/drm/i915/kernel.git tags/topic/step-2026-04-09
for you to fetch changes up to baf310b9836445ca9056f04ec347293963a1cc6e:
drm/i915/display: switch to including common step file directly (2026-04-09 10:10:03 +0300)
----------------------------------------------------------------
topic/step to unify xe and i915 on common steppings header and enum
----------------------------------------------------------------
Jani Nikula (3):
drm/xe/step: switch to the shared step definitions with i915 drm/xe/step: switch from enum xe_step to intel_step naming drm/i915/display: switch to including common step file directly
drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- .../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_display_wa.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 +- .../gpu/drm/xe/compat-i915-headers/intel_step.h | 13 ----- drivers/gpu/drm/xe/tests/xe_pci.c | 4 +- drivers/gpu/drm/xe/xe_step.c | 2 +- drivers/gpu/drm/xe/xe_step.h | 4 +- drivers/gpu/drm/xe/xe_step_types.h | 61 +--------------------- 18 files changed, 20 insertions(+), 90 deletions(-) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
Signature · 1 line
Jani Nikula, Intel
Quoted 10 lines · Jani Nikula
Hi Thomas, Matthew and Rodrigo -
Here's a topic pull intended for both drm-xe-next and drm-intel-next to unify the steppings header and enum between the i915 and xe drivers. I'm opting for a topic branch because merging this through either driver's -next branch would likely be painful conflicts wise.
Please pull this to drm-xe-next (*), and once you're done, I'll follow suit in drm-intel-next.
Pulled to drm-xe-next while I'm covering for Thomas.
Quoted 53 lines
Thanks,
Jani.(*) Hint, 'dim apply-pull drm-xe-next' on this message will do the
trick.The following changes since commit
4516432284e1b2ad9e70de8067f779c9c1072189:ttm/pool: track
allocated_pagesper numa node. (2026-04-08 06:52:48 +1000)are available in the Git repository at:
https://gitlab.freedesktop.org/drm/i915/kernel.git tags/topic/step-2026-04-09
for you to fetch changes up to
baf310b9836445ca9056f04ec347293963a1cc6e:drm/i915/display: switch to including common step file directly (2026-04-09 10:10:03 +0300)
----------------------------------------------------------------
topic/step to unify xe and i915 on common steppings header and enum----------------------------------------------------------------
Jani Nikula (3):
drm/xe/step: switch to the shared step definitions with i915 drm/xe/step: switch from enumxe_steptointel_stepnaming drm/i915/display: switch to including common step file directlydrivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- .../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_display_wa.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 +- .../gpu/drm/xe/compat-i915-headers/intel_step.h | 13 ----- drivers/gpu/drm/xe/tests/xe_pci.c | 4 +- drivers/gpu/drm/xe/xe_step.c | 2 +- drivers/gpu/drm/xe/xe_step.h | 4 +- drivers/gpu/drm/xe/xe_step_types.h | 61 +--------------------- 18 files changed, 20 insertions(+), 90 deletions(-) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.hSignature · 1 line
Jani Nikula, Intel
Quoted 9 lines · Rodrigo Vivi
Quoted 8 lines · Jani Nikula
Hi Thomas, Matthew and Rodrigo -
Here's a topic pull intended for both drm-xe-next and drm-intel-next to unify the steppings header and enum between the i915 and xe drivers. I'm opting for a topic branch because merging this through either driver's -next branch would likely be painful conflicts wise.
Quoted 4 lines
Quoted 2 lines
Please pull this to drm-xe-next (*), and once you're done, I'll follow suit in drm-intel-next.
Pulled to drm-xe-next while I'm covering for Thomas.
And pulled to drm-intel-next as well. Thanks a lot.
BR,
Jani.
Quoted 54 lines
Quoted 54 lines
Thanks,
Jani.(*) Hint, 'dim apply-pull drm-xe-next' on this message will do the
trick.The following changes since commit
4516432284e1b2ad9e70de8067f779c9c1072189:ttm/pool: track
allocated_pagesper numa node. (2026-04-08 06:52:48 +1000)are available in the Git repository at:
https://gitlab.freedesktop.org/drm/i915/kernel.git tags/topic/step-2026-04-09
for you to fetch changes up to
baf310b9836445ca9056f04ec347293963a1cc6e:drm/i915/display: switch to including common step file directly (2026-04-09 10:10:03 +0300)
----------------------------------------------------------------
topic/step to unify xe and i915 on common steppings header and enum----------------------------------------------------------------
Jani Nikula (3):
drm/xe/step: switch to the shared step definitions with i915 drm/xe/step: switch from enumxe_steptointel_stepnaming drm/i915/display: switch to including common step file directlydrivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- .../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_display_wa.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 +- .../gpu/drm/xe/compat-i915-headers/intel_step.h | 13 ----- drivers/gpu/drm/xe/tests/xe_pci.c | 4 +- drivers/gpu/drm/xe/xe_step.c | 2 +- drivers/gpu/drm/xe/xe_step.h | 4 +- drivers/gpu/drm/xe/xe_step_types.h | 61 +--------------------- 18 files changed, 20 insertions(+), 90 deletions(-) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.hSignature · 1 line
Jani Nikula, Intel
Signature · 1 line
Jani Nikula, Intel