* [PULL] topic/step for i915 and xe
@ 2026-04-09 8:02 Jani Nikula
2026-04-09 14:30 ` Rodrigo Vivi
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2026-04-09 8:02 UTC (permalink / raw)
To: Rodrigo Vivi, Thomas Hellström, Matthew Brost
Cc: Dave Airlie, Simona Vetter, Joonas Lahtinen, Tvrtko Ursulin,
Maarten Lankhorst, Thomas Zimmermann, Maxime Ripard, Oded Gabbay,
dri-devel, intel-gfx, intel-xe, dim-tools
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
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PULL] topic/step for i915 and xe
2026-04-09 8:02 [PULL] topic/step for i915 and xe Jani Nikula
@ 2026-04-09 14:30 ` Rodrigo Vivi
2026-04-10 8:06 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Rodrigo Vivi @ 2026-04-09 14:30 UTC (permalink / raw)
To: Jani Nikula
Cc: Thomas Hellström, Matthew Brost, Dave Airlie, Simona Vetter,
Joonas Lahtinen, Tvrtko Ursulin, Maarten Lankhorst,
Thomas Zimmermann, Maxime Ripard, Oded Gabbay, dri-devel,
intel-gfx, intel-xe, dim-tools
On Thu, Apr 09, 2026 at 11:02:20AM +0300, Jani Nikula wrote:
>
> 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.
>
> 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
>
> --
> Jani Nikula, Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PULL] topic/step for i915 and xe
2026-04-09 14:30 ` Rodrigo Vivi
@ 2026-04-10 8:06 ` Jani Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2026-04-10 8:06 UTC (permalink / raw)
To: Rodrigo Vivi
Cc: Thomas Hellström, Matthew Brost, Dave Airlie, Simona Vetter,
Joonas Lahtinen, Tvrtko Ursulin, Maarten Lankhorst,
Thomas Zimmermann, Maxime Ripard, Oded Gabbay, dri-devel,
intel-gfx, intel-xe, dim-tools
On Thu, 09 Apr 2026, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Thu, Apr 09, 2026 at 11:02:20AM +0300, Jani Nikula wrote:
>>
>> 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.
And pulled to drm-intel-next as well. Thanks a lot.
BR,
Jani.
>
>>
>> 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
>>
>> --
>> Jani Nikula, Intel
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-04-10 8:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-09 8:02 [PULL] topic/step for i915 and xe Jani Nikula
2026-04-09 14:30 ` Rodrigo Vivi
2026-04-10 8:06 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox