On Mon, Dec 29, 2025 at 01:54:43PM +0200, Jani Nikula wrote: > The i915_fence_context_timeout() and i915_fence_timeout() functions both > have the struct drm_i915_private parameter, which is unused. It's likely > in preparation for something that just didn't end up happening. > > Remove them, dropping the last struct drm_i915_private usage for xe > display build. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.c | 4 +--- > drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- > drivers/gpu/drm/i915/i915_config.c | 3 +-- > drivers/gpu/drm/i915/i915_config.h | 10 +++------- > drivers/gpu/drm/i915/i915_request.c | 3 +-- > drivers/gpu/drm/xe/compat-i915-headers/i915_config.h | 5 +---- > 6 files changed, 8 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index cd482e5ff929..0819236a797c 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -50,7 +50,6 @@ > #include "g4x_hdmi.h" > #include "hsw_ips.h" > #include "i915_config.h" > -#include "i915_drv.h" > #include "i915_reg.h" > #include "i9xx_plane.h" > #include "i9xx_plane_regs.h" > @@ -7154,7 +7153,6 @@ static void skl_commit_modeset_enables(struct > intel_atomic_state *state) > > static void intel_atomic_commit_fence_wait(struct intel_atomic_state > *intel_state) > { > - struct drm_i915_private *i915 = to_i915(intel_state->base.dev); > struct drm_plane *plane; > struct drm_plane_state *new_plane_state; > long ret; > @@ -7163,7 +7161,7 @@ static void intel_atomic_commit_fence_wait(struct > intel_atomic_state *intel_stat > for_each_new_plane_in_state(&intel_state->base, plane, new_plane_state, > i) { > if (new_plane_state->fence) { > ret = dma_fence_wait_timeout(new_plane_state->fence, > false, > - i915_fence_timeout(i915)); > + i915_fence_timeout()); > if (ret <= 0) > break; > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > index c4854c5b4e0f..c1deea20c28a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > @@ -113,7 +113,7 @@ bool i915_gem_clflush_object(struct drm_i915_gem_object > *obj, > if (clflush) { > i915_sw_fence_await_reservation(&clflush->base.chain, > obj->base.resv, true, > - i915_fence_timeout(i915), > + i915_fence_timeout(), > I915_FENCE_GFP); > dma_resv_add_fence(obj->base.resv, &clflush->base.dma, > DMA_RESV_USAGE_KERNEL); > diff --git a/drivers/gpu/drm/i915/i915_config.c > b/drivers/gpu/drm/i915/i915_config.c > index 3cb615ffa96d..9e13b1be407c 100644 > --- a/drivers/gpu/drm/i915/i915_config.c > +++ b/drivers/gpu/drm/i915/i915_config.c > @@ -8,8 +8,7 @@ > #include "i915_config.h" > #include "i915_jiffies.h" > > -unsigned long > -i915_fence_context_timeout(const struct drm_i915_private *i915, u64 context) > +unsigned long i915_fence_context_timeout(u64 context) > { > if (CONFIG_DRM_I915_FENCE_TIMEOUT && context) > return msecs_to_jiffies_timeout(CONFIG_DRM_I915_FENCE_TIMEOUT); > diff --git a/drivers/gpu/drm/i915/i915_config.h > b/drivers/gpu/drm/i915/i915_config.h > index 10e18b036489..f386328d9e95 100644 > --- a/drivers/gpu/drm/i915/i915_config.h > +++ b/drivers/gpu/drm/i915/i915_config.h > @@ -9,15 +9,11 @@ > #include <linux/types.h> > #include <linux/limits.h> > > -struct drm_i915_private; > +unsigned long i915_fence_context_timeout(u64 context); > > -unsigned long i915_fence_context_timeout(const struct drm_i915_private *i915, > - u64 context); > - > -static inline unsigned long > -i915_fence_timeout(const struct drm_i915_private *i915) > +static inline unsigned long i915_fence_timeout(void) > { > - return i915_fence_context_timeout(i915, U64_MAX); > + return i915_fence_context_timeout(U64_MAX); > } > > #endif /* __I915_CONFIG_H__ */ > diff --git a/drivers/gpu/drm/i915/i915_request.c > b/drivers/gpu/drm/i915/i915_request.c > index 4399941236cb..d2c7b1090df0 100644 > --- a/drivers/gpu/drm/i915/i915_request.c > +++ b/drivers/gpu/drm/i915/i915_request.c > @@ -1351,8 +1351,7 @@ __i915_request_await_external(struct i915_request *rq, > struct dma_fence *fence) > { > mark_external(rq); > return i915_sw_fence_await_dma_fence(&rq->submit, fence, > - > i915_fence_context_timeout(rq->i915, > - > fence->context), > + > i915_fence_context_timeout(fence->context), > I915_FENCE_GFP); > } > > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h > b/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h > index e835bea08d1b..d4522203e2dd 100644 > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h > +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h > @@ -8,10 +8,7 @@ > > #include <linux/sched.h> > > -struct drm_i915_private; > - > -static inline unsigned long > -i915_fence_timeout(const struct drm_i915_private *i915) > +static inline unsigned long i915_fence_timeout(void) > { > return MAX_SCHEDULE_TIMEOUT; > } > -- > 2.47.3 > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
