On Mon, Sep 08, 2025 at 05:11:47PM +0300, Jani Nikula wrote:
> Move timer related utilities from i915_utils.[ch] to separate new files
> i915_timer_util.[ch]. Clean up related includes.
>
> Note: Arguably none of this should exist in i915 in the first place. At
> least isolate it better.
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com>
> ---
> drivers/gpu/drm/i915/Makefile | 1 +
> .../drm/i915/gt/intel_execlists_submission.c | 4 ++-
> drivers/gpu/drm/i915/gt/sysfs_engines.c | 1 +
> drivers/gpu/drm/i915/i915_timer_util.c | 36 +++++++++++++++++++
> drivers/gpu/drm/i915/i915_timer_util.h | 23 ++++++++++++
> drivers/gpu/drm/i915/i915_utils.c | 30 ----------------
> drivers/gpu/drm/i915/i915_utils.h | 14 --------
> 7 files changed, 64 insertions(+), 45 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/i915_timer_util.c
> create mode 100644 drivers/gpu/drm/i915/i915_timer_util.h
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index db150a0c33ce..e58c0c158b3a 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -32,6 +32,7 @@ i915-y += \
> i915_scatterlist.o \
> i915_switcheroo.o \
> i915_sysfs.o \
> + i915_timer_util.o \
> i915_utils.o \
> intel_clock_gating.o \
> intel_cpu_info.o \
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 03baa7fa0a27..52c8fddedfce 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -106,14 +106,16 @@
> * preemption, but just sampling the new tail pointer).
> *
> */
> +
> #include <linux/interrupt.h>
> #include <linux/string_helpers.h>
>
> +#include "gen8_engine_cs.h"
> #include "i915_drv.h"
> #include "i915_reg.h"
> +#include "i915_timer_util.h"
> #include "i915_trace.h"
> #include "i915_vgpu.h"
> -#include "gen8_engine_cs.h"
> #include "intel_breadcrumbs.h"
> #include "intel_context.h"
> #include "intel_engine_heartbeat.h"
> diff --git a/drivers/gpu/drm/i915/gt/sysfs_engines.c
> b/drivers/gpu/drm/i915/gt/sysfs_engines.c
> index aab2759067d2..4a81bc396b21 100644
> --- a/drivers/gpu/drm/i915/gt/sysfs_engines.c
> +++ b/drivers/gpu/drm/i915/gt/sysfs_engines.c
> @@ -7,6 +7,7 @@
> #include <linux/sysfs.h>
>
> #include "i915_drv.h"
> +#include "i915_timer_util.h"
> #include "intel_engine.h"
> #include "intel_engine_heartbeat.h"
> #include "sysfs_engines.h"
> diff --git a/drivers/gpu/drm/i915/i915_timer_util.c
> b/drivers/gpu/drm/i915/i915_timer_util.c
> new file mode 100644
> index 000000000000..ee4cfd8b3c07
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/i915_timer_util.c
> @@ -0,0 +1,36 @@
> +// SPDX-License-Identifier: MIT
> +/* Copyright © 2025 Intel Corporation */
> +
> +#include <linux/jiffies.h>
> +
> +#include "i915_timer_util.h"
> +
> +void cancel_timer(struct timer_list *t)
> +{
> + if (!timer_active(t))
> + return;
> +
> + timer_delete(t);
> + WRITE_ONCE(t->expires, 0);
> +}
> +
> +void set_timer_ms(struct timer_list *t, unsigned long timeout)
> +{
> + if (!timeout) {
> + cancel_timer(t);
> + return;
> + }
> +
> + timeout = msecs_to_jiffies(timeout);
> +
> + /*
> + * Paranoia to make sure the compiler computes the timeout before
> + * loading 'jiffies' as jiffies is volatile and may be updated in
> + * the background by a timer tick. All to reduce the complexity
> + * of the addition and reduce the risk of losing a jiffy.
> + */
> + barrier();
> +
> + /* Keep t->expires = 0 reserved to indicate a canceled timer. */
> + mod_timer(t, jiffies + timeout ?: 1);
> +}
> diff --git a/drivers/gpu/drm/i915/i915_timer_util.h
> b/drivers/gpu/drm/i915/i915_timer_util.h
> new file mode 100644
> index 000000000000..f35ad730820c
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/i915_timer_util.h
> @@ -0,0 +1,23 @@
> +/* SPDX-License-Identifier: MIT */
> +/* Copyright © 2025 Intel Corporation */
> +
> +#ifndef __I915_TIMER_UTIL_H__
> +#define __I915_TIMER_UTIL_H__
> +
> +#include <linux/timer.h>
> +#include <asm/rwonce.h>
> +
> +void cancel_timer(struct timer_list *t);
> +void set_timer_ms(struct timer_list *t, unsigned long timeout);
> +
> +static inline bool timer_active(const struct timer_list *t)
> +{
> + return READ_ONCE(t->expires);
> +}
> +
> +static inline bool timer_expired(const struct timer_list *t)
> +{
> + return timer_active(t) && !timer_pending(t);
> +}
> +
> +#endif /* __I915_TIMER_UTIL_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_utils.c
> b/drivers/gpu/drm/i915/i915_utils.c
> index b60c28fbd207..49f7ed413132 100644
> --- a/drivers/gpu/drm/i915/i915_utils.c
> +++ b/drivers/gpu/drm/i915/i915_utils.c
> @@ -47,36 +47,6 @@ bool i915_error_injected(void)
>
> #endif
>
> -void cancel_timer(struct timer_list *t)
> -{
> - if (!timer_active(t))
> - return;
> -
> - timer_delete(t);
> - WRITE_ONCE(t->expires, 0);
> -}
> -
> -void set_timer_ms(struct timer_list *t, unsigned long timeout)
> -{
> - if (!timeout) {
> - cancel_timer(t);
> - return;
> - }
> -
> - timeout = msecs_to_jiffies(timeout);
> -
> - /*
> - * Paranoia to make sure the compiler computes the timeout before
> - * loading 'jiffies' as jiffies is volatile and may be updated in
> - * the background by a timer tick. All to reduce the complexity
> - * of the addition and reduce the risk of losing a jiffy.
> - */
> - barrier();
> -
> - /* Keep t->expires = 0 reserved to indicate a canceled timer. */
> - mod_timer(t, jiffies + timeout ?: 1);
> -}
> -
> bool i915_vtd_active(struct drm_i915_private *i915)
> {
> if (device_iommu_mapped(i915->drm.dev))
> diff --git a/drivers/gpu/drm/i915/i915_utils.h
> b/drivers/gpu/drm/i915/i915_utils.h
> index dff02a944a57..6278a74d08c2 100644
> --- a/drivers/gpu/drm/i915/i915_utils.h
> +++ b/drivers/gpu/drm/i915/i915_utils.h
> @@ -38,7 +38,6 @@
> #endif
>
> struct drm_i915_private;
> -struct timer_list;
>
> #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
> __stringify(x), (long)(x))
> @@ -270,19 +269,6 @@ static inline void __add_taint_for_CI(unsigned int taint)
> add_taint(taint, LOCKDEP_STILL_OK);
> }
>
> -void cancel_timer(struct timer_list *t);
> -void set_timer_ms(struct timer_list *t, unsigned long timeout);
> -
> -static inline bool timer_active(const struct timer_list *t)
> -{
> - return READ_ONCE(t->expires);
> -}
> -
> -static inline bool timer_expired(const struct timer_list *t)
> -{
> - return timer_active(t) && !timer_pending(t);
> -}
> -
> static inline bool i915_run_as_guest(void)
> {
> #if IS_ENABLED(CONFIG_X86)
> --
> 2.47.3
>
