On Fri, Nov 14, 2025 at 12:26:49PM +0200, Jani Nikula wrote: > Reduce the conditional compilation in i915 by building > intel_display_rps.c as part of the xe module. This doesn't actually > enable RPS on xe, because there's no parent interface implementation on > xe side, but it's a step in the right direction. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > .../gpu/drm/i915/display/intel_display_rps.h | 21 ------------------- > drivers/gpu/drm/xe/Makefile | 1 + > 2 files changed, 1 insertion(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_rps.h > b/drivers/gpu/drm/i915/display/intel_display_rps.h > index 183d154f2c7c..96b1fd00ead4 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_rps.h > +++ b/drivers/gpu/drm/i915/display/intel_display_rps.h > @@ -13,7 +13,6 @@ struct drm_crtc; > struct intel_atomic_state; > struct intel_display; > > -#ifdef I915 > void intel_display_rps_boost_after_vblank(struct drm_crtc *crtc, > struct dma_fence *fence); > void intel_display_rps_mark_interactive(struct intel_display *display, > @@ -22,25 +21,5 @@ void intel_display_rps_mark_interactive(struct > intel_display *display, > void ilk_display_rps_enable(struct intel_display *display); > void ilk_display_rps_disable(struct intel_display *display); > void ilk_display_rps_irq_handler(struct intel_display *display); > -#else > -static inline void intel_display_rps_boost_after_vblank(struct drm_crtc > *crtc, > - struct dma_fence *fence) > -{ > -} > -static inline void intel_display_rps_mark_interactive(struct intel_display > *display, > - struct intel_atomic_state > *state, > - bool interactive) > -{ > -} > -static inline void ilk_display_rps_enable(struct intel_display *display) > -{ > -} > -static inline void ilk_display_rps_disable(struct intel_display *display) > -{ > -} > -static inline void ilk_display_rps_irq_handler(struct intel_display *display) > -{ > -} > -#endif > > #endif /* __INTEL_DISPLAY_RPS_H__ */ > diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile > index c2d2303a8198..1a3aa041820d 100644 > --- a/drivers/gpu/drm/xe/Makefile > +++ b/drivers/gpu/drm/xe/Makefile > @@ -259,6 +259,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ > i915-display/intel_display_power_map.o \ > i915-display/intel_display_power_well.o \ > i915-display/intel_display_rpm.o \ > + i915-display/intel_display_rps.o \ > i915-display/intel_display_trace.o \ > i915-display/intel_display_utils.o \ > i915-display/intel_display_wa.o \ > -- > 2.47.3 -- Ville Syrjälä Intel
