Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: split out separate files for jiffies timeout and wait helpers
Add i915_jiffies.h and intel_display_jiffies.h for jiffies timeout and
wait helpers, and use them separately from i915 and display. This helps
reduce the display dependency on i915_utils.h.
Long term, both msecs_to_jiffies_timeout() and
wait_remaining_ms_from_jiffies() really belong in core kernel headers,
but for now unblock display refactoring.
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patch.msgid.link/d8bc62b3a81afa05c849dde9b0f633572eaf5611.1761146196.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+73
-37
+43
drivers/gpu/drm/i915/display/intel_display_jiffies.h
+43
drivers/gpu/drm/i915/display/intel_display_jiffies.h
···
1
+
/* SPDX-License-Identifier: MIT */
2
+
/* Copyright © 2025 Intel Corporation */
3
+
4
+
#ifndef __INTEL_DISPLAY_JIFFIES_H__
5
+
#define __INTEL_DISPLAY_JIFFIES_H__
6
+
7
+
#include <linux/jiffies.h>
8
+
9
+
static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)
10
+
{
11
+
unsigned long j = msecs_to_jiffies(m);
12
+
13
+
return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1);
14
+
}
15
+
16
+
/*
17
+
* If you need to wait X milliseconds between events A and B, but event B
18
+
* doesn't happen exactly after event A, you record the timestamp (jiffies) of
19
+
* when event A happened, then just before event B you call this function and
20
+
* pass the timestamp as the first argument, and X as the second argument.
21
+
*/
22
+
static inline void
23
+
wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms)
24
+
{
25
+
unsigned long target_jiffies, tmp_jiffies, remaining_jiffies;
26
+
27
+
/*
28
+
* Don't re-read the value of "jiffies" every time since it may change
29
+
* behind our back and break the math.
30
+
*/
31
+
tmp_jiffies = jiffies;
32
+
target_jiffies = timestamp_jiffies +
33
+
msecs_to_jiffies_timeout(to_wait_ms);
34
+
35
+
if (time_after(target_jiffies, tmp_jiffies)) {
36
+
remaining_jiffies = target_jiffies - tmp_jiffies;
37
+
while (remaining_jiffies)
38
+
remaining_jiffies =
39
+
schedule_timeout_uninterruptible(remaining_jiffies);
40
+
}
41
+
}
42
+
43
+
#endif /* __INTEL_DISPLAY_JIFFIES_H__ */
+1
drivers/gpu/drm/i915/display/intel_dp.c
+1
drivers/gpu/drm/i915/display/intel_dp.c
+1
drivers/gpu/drm/i915/display/intel_dp_link_training.c
+1
drivers/gpu/drm/i915/display/intel_dp_link_training.c
+1
drivers/gpu/drm/i915/display/intel_hdcp.c
+1
drivers/gpu/drm/i915/display/intel_hdcp.c
+1
drivers/gpu/drm/i915/display/intel_pmdemand.c
+1
drivers/gpu/drm/i915/display/intel_pmdemand.c
+1
drivers/gpu/drm/i915/display/intel_pps.c
+1
drivers/gpu/drm/i915/display/intel_pps.c
+1
drivers/gpu/drm/i915/display/intel_vblank.c
+1
drivers/gpu/drm/i915/display/intel_vblank.c
+3
-2
drivers/gpu/drm/i915/gem/i915_gem_mman.c
+3
-2
drivers/gpu/drm/i915/gem/i915_gem_mman.c
···
16
16
#include "i915_gem_evict.h"
17
17
#include "i915_gem_gtt.h"
18
18
#include "i915_gem_ioctls.h"
19
-
#include "i915_gem_object.h"
20
19
#include "i915_gem_mman.h"
20
+
#include "i915_gem_object.h"
21
+
#include "i915_gem_ttm.h"
22
+
#include "i915_jiffies.h"
21
23
#include "i915_mm.h"
22
24
#include "i915_trace.h"
23
25
#include "i915_user_extensions.h"
24
-
#include "i915_gem_ttm.h"
25
26
#include "i915_vma.h"
26
27
27
28
static inline bool
+1
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+1
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+1
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+1
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+1
drivers/gpu/drm/i915/gt/selftest_execlists.c
+1
drivers/gpu/drm/i915/gt/selftest_execlists.c
+1
-1
drivers/gpu/drm/i915/i915_config.c
+1
-1
drivers/gpu/drm/i915/i915_config.c
+16
drivers/gpu/drm/i915/i915_jiffies.h
+16
drivers/gpu/drm/i915/i915_jiffies.h
···
1
+
/* SPDX-License-Identifier: MIT */
2
+
/* Copyright © 2025 Intel Corporation */
3
+
4
+
#ifndef __I915_JIFFIES_H__
5
+
#define __I915_JIFFIES_H__
6
+
7
+
#include <linux/jiffies.h>
8
+
9
+
static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)
10
+
{
11
+
unsigned long j = msecs_to_jiffies(m);
12
+
13
+
return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1);
14
+
}
15
+
16
+
#endif /* __I915_JIFFIES_H__ */
-34
drivers/gpu/drm/i915/i915_utils.h
-34
drivers/gpu/drm/i915/i915_utils.h
···
100
100
return (n != 0 && ((n & (n - 1)) == 0));
101
101
}
102
102
103
-
static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)
104
-
{
105
-
unsigned long j = msecs_to_jiffies(m);
106
-
107
-
return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1);
108
-
}
109
-
110
-
/*
111
-
* If you need to wait X milliseconds between events A and B, but event B
112
-
* doesn't happen exactly after event A, you record the timestamp (jiffies) of
113
-
* when event A happened, then just before event B you call this function and
114
-
* pass the timestamp as the first argument, and X as the second argument.
115
-
*/
116
-
static inline void
117
-
wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms)
118
-
{
119
-
unsigned long target_jiffies, tmp_jiffies, remaining_jiffies;
120
-
121
-
/*
122
-
* Don't re-read the value of "jiffies" every time since it may change
123
-
* behind our back and break the math.
124
-
*/
125
-
tmp_jiffies = jiffies;
126
-
target_jiffies = timestamp_jiffies +
127
-
msecs_to_jiffies_timeout(to_wait_ms);
128
-
129
-
if (time_after(target_jiffies, tmp_jiffies)) {
130
-
remaining_jiffies = target_jiffies - tmp_jiffies;
131
-
while (remaining_jiffies)
132
-
remaining_jiffies =
133
-
schedule_timeout_uninterruptible(remaining_jiffies);
134
-
}
135
-
}
136
-
137
103
#define KHz(x) (1000 * (x))
138
104
#define MHz(x) KHz(1000 * (x))
139
105