On Wed, 2025-10-22 at 18:17 +0300, Jani Nikula wrote: > Reduce the compat i915_utils.h to only cover the requirements of > MISSING_CASE() in soc/ and the few i915_inject_probe_failure() > instances, instead of including the entire i915_utils.h from i915. This > prevents new users for the utilities from cropping up. > > With this, we can remove the xe/display/ext/i915_utils.c altogether. > > Signed-off-by: Jani Nikula <[email protected]> > ---
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca. > drivers/gpu/drm/xe/Makefile | 1 - > .../gpu/drm/xe/compat-i915-headers/i915_utils.h | 9 ++++++++- > drivers/gpu/drm/xe/display/ext/i915_utils.c | 17 ----------------- > 3 files changed, 8 insertions(+), 19 deletions(-) > delete mode 100644 drivers/gpu/drm/xe/display/ext/i915_utils.c > > diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile > index feb8225d4d79..a7bcc3948a31 100644 > --- a/drivers/gpu/drm/xe/Makefile > +++ b/drivers/gpu/drm/xe/Makefile > @@ -205,7 +205,6 @@ $(obj)/i915-display/%.o: > $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE > # Display code specific to xe > xe-$(CONFIG_DRM_XE_DISPLAY) += \ > display/ext/i915_irq.o \ > - display/ext/i915_utils.o \ > display/intel_bo.o \ > display/intel_fb_bo.o \ > display/intel_fbdev_fb.o \ > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h > b/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h > index 1d7c4360e5c0..bcd441dc0fce 100644 > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h > +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h > @@ -3,4 +3,11 @@ > * Copyright © 2023 Intel Corporation > */ > > -#include "../../i915/i915_utils.h" > +/* for soc/ */ > +#ifndef MISSING_CASE > +#define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \ > + __stringify(x), (long)(x)) > +#endif > + > +/* for a couple of users under i915/display */ > +#define i915_inject_probe_failure(unused) ((unused) && 0) > diff --git a/drivers/gpu/drm/xe/display/ext/i915_utils.c > b/drivers/gpu/drm/xe/display/ext/i915_utils.c > deleted file mode 100644 > index af9ec2abbaa1..000000000000 > --- a/drivers/gpu/drm/xe/display/ext/i915_utils.c > +++ /dev/null > @@ -1,17 +0,0 @@ > -// SPDX-License-Identifier: MIT > -/* > - * Copyright © 2023 Intel Corporation > - */ > - > -#include "i915_utils.h" > - > -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG) > - > -/* i915 specific, just put here for shutting it up */ > -int __i915_inject_probe_error(struct drm_i915_private *i915, int err, > - const char *func, int line) > -{ > - return 0; > -} > - > -#endif
