[PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Uma Shankar]

Display Code is made independent of i915_reg.h, hence
it can be dropped from compat header.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
deleted file mode 100644
index 8619ec015ad4..000000000000
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#include "../../i915/i915_reg.h"
-- 
2.50.1

✓ i915.CI.BAT: success for drm/xe/compat: Remove unused i915_reg.h from compat header

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2011 bytes --]

== Series Details ==

Series: drm/xe/compat: Remove unused i915_reg.h from compat header
URL   : https://patchwork.freedesktop.org/series/161993/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18022 -> Patchwork_161993v1
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_161993v1/index.html

Participating hosts (43 -> 41)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_161993v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@core_hotunplug@unbind-rebind:
    - bat-apl-1:          [PASS][1] -> [ABORT][2] ([i915#15677])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18022/bat-apl-1/igt@core_hotunplug@unbind-rebind.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_161993v1/bat-apl-1/igt@core_hotunplug@unbind-rebind.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@workarounds:
    - bat-arls-6:         [DMESG-FAIL][3] ([i915#12061]) -> [PASS][4] +1 other test pass
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18022/bat-arls-6/igt@i915_selftest@live@workarounds.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_161993v1/bat-arls-6/igt@i915_selftest@live@workarounds.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#15677]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15677


Build changes
-------------

  * Linux: CI_DRM_18022 -> Patchwork_161993v1

  CI-20190529: 20190529
  CI_DRM_18022: 45a3045fc0dc46a893cb8bbe304afafd4120c904 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8765: 8765
  Patchwork_161993v1: 45a3045fc0dc46a893cb8bbe304afafd4120c904 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_161993v1/index.html

[-- Attachment #2: Type: text/html, Size: 2621 bytes --]

Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Jani Nikula]

On Mon, 23 Feb 2026, Uma Shankar <uma.shankar@intel.com> wrote:
> Display Code is made independent of i915_reg.h, hence
> it can be dropped from compat header.
>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>

I already sent the same patch earlier, but *shrug*.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
>  1 file changed, 6 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
>
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> deleted file mode 100644
> index 8619ec015ad4..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2023 Intel Corporation
> - */
> -
> -#include "../../i915/i915_reg.h"

-- 
Jani Nikula, Intel

RE: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Shankar, Uma]

> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Tuesday, February 24, 2026 6:37 PM
> To: Shankar, Uma <uma.shankar@intel.com>; intel-gfx@lists.freedesktop.org;
> intel-xe@lists.freedesktop.org
> Cc: ville.syrjala@linux.intel.com; Shankar, Uma <uma.shankar@intel.com>
> Subject: Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat
> header
> 
> On Mon, 23 Feb 2026, Uma Shankar <uma.shankar@intel.com> wrote:
> > Display Code is made independent of i915_reg.h, hence it can be
> > dropped from compat header.
> >
> > Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> 
> I already sent the same patch earlier, but *shrug*.

Oh, sorry missed that Jani. It was on my ToDo list from last week 😊
Thanks for the review.

Regards,
Uma Shankar

> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> > ---
> >  drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
> >  1 file changed, 6 deletions(-)
> >  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> >
> > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > deleted file mode 100644
> > index 8619ec015ad4..000000000000
> > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > +++ /dev/null
> > @@ -1,6 +0,0 @@
> > -/* SPDX-License-Identifier: MIT */
> > -/*
> > - * Copyright © 2023 Intel Corporation
> > - */
> > -
> > -#include "../../i915/i915_reg.h"
> 
> --
> Jani Nikula, Intel

RE: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Shankar, Uma]

> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Tuesday, February 24, 2026 6:37 PM
> To: Shankar, Uma <uma.shankar@intel.com>; intel-gfx@lists.freedesktop.org;
> intel-xe@lists.freedesktop.org
> Cc: ville.syrjala@linux.intel.com; Shankar, Uma <uma.shankar@intel.com>
> Subject: Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat
> header
> 
> On Mon, 23 Feb 2026, Uma Shankar <uma.shankar@intel.com> wrote:
> > Display Code is made independent of i915_reg.h, hence it can be
> > dropped from compat header.
> >
> > Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> 
> I already sent the same patch earlier, but *shrug*.
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Pushed to drm-xe-next. Thanks for the review.

Regards,
Uma Shankar

> > ---
> >  drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
> >  1 file changed, 6 deletions(-)
> >  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> >
> > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > deleted file mode 100644
> > index 8619ec015ad4..000000000000
> > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > +++ /dev/null
> > @@ -1,6 +0,0 @@
> > -/* SPDX-License-Identifier: MIT */
> > -/*
> > - * Copyright © 2023 Intel Corporation
> > - */
> > -
> > -#include "../../i915/i915_reg.h"
> 
> --
> Jani Nikula, Intel

Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Matt Roper]

On Wed, Feb 25, 2026 at 04:40:23PM +0000, Shankar, Uma wrote:
> 
> 
> > -----Original Message-----
> > From: Nikula, Jani <jani.nikula@intel.com>
> > Sent: Tuesday, February 24, 2026 6:37 PM
> > To: Shankar, Uma <uma.shankar@intel.com>; intel-gfx@lists.freedesktop.org;
> > intel-xe@lists.freedesktop.org
> > Cc: ville.syrjala@linux.intel.com; Shankar, Uma <uma.shankar@intel.com>
> > Subject: Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat
> > header
> > 
> > On Mon, 23 Feb 2026, Uma Shankar <uma.shankar@intel.com> wrote:
> > > Display Code is made independent of i915_reg.h, hence it can be
> > > dropped from compat header.
> > >
> > > Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> > 
> > I already sent the same patch earlier, but *shrug*.
> > 
> > Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> Pushed to drm-xe-next. Thanks for the review.

Even though this is an Xe patch it might have been better to send this
one through drm-intel-next rather than drm-xe-next since drm-xe-next
doesn't have the prerequisite display patches yet to make this header
removal possible.  So at the moment the build of drm-xe-next is broken.
Not a huge issue since drm-tip is fine, and drm-xe-next will likely be
fixed soon whenever a backmerge happens, but I figured I should point it
out.


Matt

> 
> Regards,
> Uma Shankar
> 
> > > ---
> > >  drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
> > >  1 file changed, 6 deletions(-)
> > >  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > >
> > > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > > b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > > deleted file mode 100644
> > > index 8619ec015ad4..000000000000
> > > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> > > +++ /dev/null
> > > @@ -1,6 +0,0 @@
> > > -/* SPDX-License-Identifier: MIT */
> > > -/*
> > > - * Copyright © 2023 Intel Corporation
> > > - */
> > > -
> > > -#include "../../i915/i915_reg.h"
> > 
> > --
> > Jani Nikula, Intel

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation

Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Jani Nikula]

On Wed, 25 Feb 2026, Matt Roper <matthew.d.roper@intel.com> wrote:
> On Wed, Feb 25, 2026 at 04:40:23PM +0000, Shankar, Uma wrote:
>> Pushed to drm-xe-next. Thanks for the review.
>
> Even though this is an Xe patch it might have been better to send this
> one through drm-intel-next rather than drm-xe-next since drm-xe-next
> doesn't have the prerequisite display patches yet to make this header
> removal possible.  So at the moment the build of drm-xe-next is broken.
> Not a huge issue since drm-tip is fine, and drm-xe-next will likely be
> fixed soon whenever a backmerge happens, but I figured I should point it
> out.

On the contrary, I think it is an issue that warrants a revert.

It's a hard requirement that committers *always* build the branch they
apply patches to before pushing, no exceptions. CI doesn't guarantee
that at all.

With the build already broken, you can't do that, and more breakage can
slip in until it's fixed.

It'll take a drm-intel-next pull request to drm-next, and then a
drm-next backmerge to drm-xe-next to fix this, and we don't generally
want to rush that to hotfix build issues like this. The build failure
*before* pushing is an indication a backmerge might be needed, and
that's the normal order of things.


BR,
Jani.


-- 
Jani Nikula, Intel

RE: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Shankar, Uma]

> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Wednesday, February 25, 2026 11:42 PM
> To: Roper, Matthew D <matthew.d.roper@intel.com>; Shankar, Uma
> <uma.shankar@intel.com>
> Cc: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org;
> ville.syrjala@linux.intel.com; Vivi, Rodrigo <rodrigo.vivi@intel.com>; Thomas
> Hellström <thomas.hellstrom@linux.intel.com>; Brost, Matthew
> <matthew.brost@intel.com>
> Subject: Re: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat
> header
> 
> On Wed, 25 Feb 2026, Matt Roper <matthew.d.roper@intel.com> wrote:
> > On Wed, Feb 25, 2026 at 04:40:23PM +0000, Shankar, Uma wrote:
> >> Pushed to drm-xe-next. Thanks for the review.
> >
> > Even though this is an Xe patch it might have been better to send this
> > one through drm-intel-next rather than drm-xe-next since drm-xe-next
> > doesn't have the prerequisite display patches yet to make this header
> > removal possible.  So at the moment the build of drm-xe-next is broken.
> > Not a huge issue since drm-tip is fine, and drm-xe-next will likely be
> > fixed soon whenever a backmerge happens, but I figured I should point
> > it out.

I did compile check before merge but somehow had a config with xe build disabled (face palm ☹).
Thanks Matt for pointing this out.

> On the contrary, I think it is an issue that warrants a revert.
> 
> It's a hard requirement that committers *always* build the branch they apply
> patches to before pushing, no exceptions. CI doesn't guarantee that at all.
> 
> With the build already broken, you can't do that, and more breakage can slip in
> until it's fixed.
> 
> It'll take a drm-intel-next pull request to drm-next, and then a drm-next backmerge
> to drm-xe-next to fix this, and we don't generally want to rush that to hotfix build
> issues like this. The build failure
> *before* pushing is an indication a backmerge might be needed, and that's the
> normal order of things.

Thanks Jani, shall I send a revert on drm-xe-next and push through drm-intel-next instead ?
Apologies for the noise on this.

Regards,
Uma Shankar

> 
> BR,
> Jani.
> 
> 
> --
> Jani Nikula, Intel

RE: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Jani Nikula]

On Thu, 26 Feb 2026, "Shankar, Uma" <uma.shankar@intel.com> wrote:
> Thanks Jani, shall I send a revert on drm-xe-next and push through
> drm-intel-next instead ?

Yes, please.

> Apologies for the noise on this.

No worries, it happens.

BR,
Jani.


-- 
Jani Nikula, Intel

[PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Uma Shankar]

Display Code is made independent of i915_reg.h, hence
it can be dropped from compat header.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
deleted file mode 100644
index 8619ec015ad4..000000000000
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#include "../../i915/i915_reg.h"
-- 
2.50.1

RE: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat header

[Shankar, Uma]

> -----Original Message-----
> From: Shankar, Uma <uma.shankar@intel.com>
> Sent: Thursday, February 26, 2026 11:26 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>; Shankar, Uma
> <uma.shankar@intel.com>
> Subject: [PATCH] drm/xe/compat: Remove unused i915_reg.h from compat
> header
> 
> Display Code is made independent of i915_reg.h, hence it can be dropped from
> compat header.

Fixed earlier fumble and pushed the change through drm-intel-next.

Regards,
Uma Shankar

> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 ------
>  1 file changed, 6 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> 
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> deleted file mode 100644
> index 8619ec015ad4..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2023 Intel Corporation
> - */
> -
> -#include "../../i915/i915_reg.h"
> --
> 2.50.1