On Tue, 2025-11-25 at 15:24 +0200, Jani Nikula wrote: > Drop the display dependency on intel_wakeref.h header. The contract in > the parent interface is that -ENOENT means there's no tracking. It > doesn't actually require us to use a shared macro for it. Duplicate the > macro in the few places that need this instead of inlining, primarily > for documentation reasons. > > This allows us to remove the xe compat intel_wakeref.h header. > > v2: Define INTEL_WAKEREF_DEF in intel_display_power.h > > Signed-off-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display_power.h | 5 +++-- > drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h | 6 ------ > drivers/gpu/drm/xe/display/xe_display_rpm.c | 4 +++- > 3 files changed, 6 insertions(+), 9 deletions(-) > delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h > b/drivers/gpu/drm/i915/display/intel_display_power.h > index 6f8d921b4482..d616d5d09cbe 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.h > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h > @@ -9,8 +9,6 @@ > #include <linux/mutex.h> > #include <linux/workqueue.h> > > -#include "intel_wakeref.h" > - > enum aux_ch; > enum port; > struct i915_power_well; > @@ -19,6 +17,9 @@ struct intel_encoder; > struct ref_tracker; > struct seq_file; > > +/* -ENOENT means we got the ref, but there's no tracking */ > +#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT) > + > /* > * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain instances > * consecutive, so that the pipe,transcoder,port -> power domain macros > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h > b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h > deleted file mode 100644 > index 910a8a60da64..000000000000 > --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h > +++ /dev/null > @@ -1,6 +0,0 @@ > -/* SPDX-License-Identifier: MIT */ > -/* > - * Copyright © 2023 Intel Corporation > - */ > - > -#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT) > diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c > b/drivers/gpu/drm/xe/display/xe_display_rpm.c > index 9416ec784e39..b3db40035499 100644 > --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c > +++ b/drivers/gpu/drm/xe/display/xe_display_rpm.c > @@ -5,11 +5,13 @@ > > #include "intel_display_core.h" > #include "intel_display_rpm.h" > -#include "intel_wakeref.h" > #include "xe_device.h" > #include "xe_device_types.h" > #include "xe_pm.h" > > +/* -ENOENT means we got the ref, but there's no tracking */ > +#define INTEL_WAKEREF_DEF ERR_PTR(-ENOENT) > + > static struct ref_tracker *xe_display_rpm_get(const struct drm_device *drm) > { > return xe_pm_runtime_resume_and_get(to_xe_device(drm)) ? > INTEL_WAKEREF_DEF : NULL;
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca.
