On Tue, Dec 30, 2025 at 03:59:33PM +0200, Jani Nikula wrote: > On Mon, 29 Dec 2025, Matt Roper <[email protected]> wrote: > > On Mon, Dec 29, 2025 at 01:54:44PM +0200, Jani Nikula wrote: > >> The xe display build no longer needs the compat i915_drv.h or the ugly > >> -Ddrm_i915_private=xe_device hack. Remove them, with great pleasure. > >> > >> Signed-off-by: Jani Nikula <[email protected]> > > > > There's still a comment referring to this aliasing in xe_device_types.h > > (above the intel_uncore substruct) that should probably be removed too > > now that the alias is gone. Otherwise, > > I already looked at it, but Ville's going to nuke the whole uncore > member from xe_device soonish, along with the whole comment, so decided > to just let it be. That okay with you?
Yeah, that's fine with me. Matt > > > Reviewed-by: Matt Roper <[email protected]> > > > > Great cleanup to close out the year! > > Indeed, thanks a lot for the review! > > > Side question that I stumbled over by accident while reviewing this --- > > did we really never implement DPT for Xe? And everything is still > > working? It looks like even the chicken bits to disable use of DPT have > > been removed in modern platforms, so I'm surprised that things aren't > > blowing up if we aren't following the bspec's requirement that all tiled > > framebuffers use DPT. Am I overlooking something here? > > It's... different. See xe_fb_pin.c for example. I don't claim to have an > in depth understanding. > > BR, > Jani. > > > > > > > > > Matt > > > >> --- > >> drivers/gpu/drm/xe/Makefile | 3 +-- > >> .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 22 ------------------- > >> 2 files changed, 1 insertion(+), 24 deletions(-) > >> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > >> > >> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile > >> index 3315f93a35b2..2b20c79d7ec9 100644 > >> --- a/drivers/gpu/drm/xe/Makefile > >> +++ b/drivers/gpu/drm/xe/Makefile > >> @@ -200,8 +200,7 @@ endif > >> # i915 Display compat #defines and #includes > >> subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ > >> -I$(src)/compat-i915-headers \ > >> - -I$(srctree)/drivers/gpu/drm/i915/display/ \ > >> - -Ddrm_i915_private=xe_device > >> + -I$(srctree)/drivers/gpu/drm/i915/display/ > >> > >> # Rule to build display code shared with i915 > >> $(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE > >> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > >> b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > >> deleted file mode 100644 > >> index 04d1925f9a19..000000000000 > >> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > >> +++ /dev/null > >> @@ -1,22 +0,0 @@ > >> -/* SPDX-License-Identifier: MIT */ > >> -/* > >> - * Copyright © 2023 Intel Corporation > >> - */ > >> -#ifndef _XE_I915_DRV_H_ > >> -#define _XE_I915_DRV_H_ > >> - > >> -/* > >> - * "Adaptation header" to allow i915 display to also build for xe driver. > >> - * TODO: refactor i915 and xe so this can cease to exist > >> - */ > >> - > >> -#include <drm/drm_drv.h> > >> - > >> -#include "xe_device_types.h" > >> - > >> -static inline struct drm_i915_private *to_i915(const struct drm_device > >> *dev) > >> -{ > >> - return container_of(dev, struct drm_i915_private, drm); > >> -} > >> - > >> -#endif > >> -- > >> 2.47.3 > >> > > -- > Jani Nikula, Intel -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
