Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/de: Move intel_de_wait*() into intel_de.c
intel_de_wait*() end up doing quite a bit of stuff, so the one
function call overhead from them seems insignificant. Move the
implementation intel_de.c.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260313111028.25159-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+92
-79
+72
drivers/gpu/drm/i915/display/intel_de.c
+72
drivers/gpu/drm/i915/display/intel_de.c
···
7
7
8
8
#include "intel_de.h"
9
9
10
+
int intel_de_wait_us(struct intel_display *display, i915_reg_t reg,
11
+
u32 mask, u32 value, unsigned int timeout_us,
12
+
u32 *out_value)
13
+
{
14
+
int ret;
15
+
16
+
intel_dmc_wl_get(display, reg);
17
+
18
+
ret = __intel_wait_for_register(__to_uncore(display), reg, mask,
19
+
value, timeout_us, 0, out_value);
20
+
21
+
intel_dmc_wl_put(display, reg);
22
+
23
+
return ret;
24
+
}
25
+
26
+
int intel_de_wait_ms(struct intel_display *display, i915_reg_t reg,
27
+
u32 mask, u32 value, unsigned int timeout_ms,
28
+
u32 *out_value)
29
+
{
30
+
int ret;
31
+
32
+
intel_dmc_wl_get(display, reg);
33
+
34
+
ret = __intel_wait_for_register(__to_uncore(display), reg, mask,
35
+
value, 2, timeout_ms, out_value);
36
+
37
+
intel_dmc_wl_put(display, reg);
38
+
39
+
return ret;
40
+
}
41
+
42
+
int intel_de_wait_fw_ms(struct intel_display *display, i915_reg_t reg,
43
+
u32 mask, u32 value, unsigned int timeout_ms,
44
+
u32 *out_value)
45
+
{
46
+
return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,
47
+
value, 2, timeout_ms, out_value);
48
+
}
49
+
50
+
int intel_de_wait_fw_us_atomic(struct intel_display *display, i915_reg_t reg,
51
+
u32 mask, u32 value, unsigned int timeout_us,
52
+
u32 *out_value)
53
+
{
54
+
return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,
55
+
value, timeout_us, 0, out_value);
56
+
}
57
+
58
+
int intel_de_wait_for_set_us(struct intel_display *display, i915_reg_t reg,
59
+
u32 mask, unsigned int timeout_us)
60
+
{
61
+
return intel_de_wait_us(display, reg, mask, mask, timeout_us, NULL);
62
+
}
63
+
64
+
int intel_de_wait_for_clear_us(struct intel_display *display, i915_reg_t reg,
65
+
u32 mask, unsigned int timeout_us)
66
+
{
67
+
return intel_de_wait_us(display, reg, mask, 0, timeout_us, NULL);
68
+
}
69
+
70
+
int intel_de_wait_for_set_ms(struct intel_display *display, i915_reg_t reg,
71
+
u32 mask, unsigned int timeout_ms)
72
+
{
73
+
return intel_de_wait_ms(display, reg, mask, mask, timeout_ms, NULL);
74
+
}
75
+
76
+
int intel_de_wait_for_clear_ms(struct intel_display *display, i915_reg_t reg,
77
+
u32 mask, unsigned int timeout_ms)
78
+
{
79
+
return intel_de_wait_ms(display, reg, mask, 0, timeout_ms, NULL);
80
+
}
81
+
10
82
u8 intel_de_read8(struct intel_display *display, i915_reg_t reg)
11
83
{
12
84
/* this is only used on VGA registers (possible on pre-g4x) */
+20
-79
drivers/gpu/drm/i915/display/intel_de.h
+20
-79
drivers/gpu/drm/i915/display/intel_de.h
···
86
86
return val;
87
87
}
88
88
89
-
static inline int
90
-
intel_de_wait_us(struct intel_display *display, i915_reg_t reg,
91
-
u32 mask, u32 value, unsigned int timeout_us,
92
-
u32 *out_value)
93
-
{
94
-
int ret;
95
-
96
-
intel_dmc_wl_get(display, reg);
97
-
98
-
ret = __intel_wait_for_register(__to_uncore(display), reg, mask,
99
-
value, timeout_us, 0, out_value);
100
-
101
-
intel_dmc_wl_put(display, reg);
102
-
103
-
return ret;
104
-
}
105
-
106
-
static inline int
107
-
intel_de_wait_ms(struct intel_display *display, i915_reg_t reg,
108
-
u32 mask, u32 value, unsigned int timeout_ms,
109
-
u32 *out_value)
110
-
{
111
-
int ret;
112
-
113
-
intel_dmc_wl_get(display, reg);
114
-
115
-
ret = __intel_wait_for_register(__to_uncore(display), reg, mask,
116
-
value, 2, timeout_ms, out_value);
117
-
118
-
intel_dmc_wl_put(display, reg);
119
-
120
-
return ret;
121
-
}
122
-
123
-
static inline int
124
-
intel_de_wait_fw_ms(struct intel_display *display, i915_reg_t reg,
125
-
u32 mask, u32 value, unsigned int timeout_ms,
126
-
u32 *out_value)
127
-
{
128
-
return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,
129
-
value, 2, timeout_ms, out_value);
130
-
}
131
-
132
-
static inline int
133
-
intel_de_wait_fw_us_atomic(struct intel_display *display, i915_reg_t reg,
134
-
u32 mask, u32 value, unsigned int timeout_us,
135
-
u32 *out_value)
136
-
{
137
-
return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,
138
-
value, timeout_us, 0, out_value);
139
-
}
140
-
141
-
static inline int
142
-
intel_de_wait_for_set_us(struct intel_display *display, i915_reg_t reg,
143
-
u32 mask, unsigned int timeout_us)
144
-
{
145
-
return intel_de_wait_us(display, reg, mask, mask, timeout_us, NULL);
146
-
}
147
-
148
-
static inline int
149
-
intel_de_wait_for_clear_us(struct intel_display *display, i915_reg_t reg,
150
-
u32 mask, unsigned int timeout_us)
151
-
{
152
-
return intel_de_wait_us(display, reg, mask, 0, timeout_us, NULL);
153
-
}
154
-
155
-
static inline int
156
-
intel_de_wait_for_set_ms(struct intel_display *display, i915_reg_t reg,
157
-
u32 mask, unsigned int timeout_ms)
158
-
{
159
-
return intel_de_wait_ms(display, reg, mask, mask, timeout_ms, NULL);
160
-
}
161
-
162
-
static inline int
163
-
intel_de_wait_for_clear_ms(struct intel_display *display, i915_reg_t reg,
164
-
u32 mask, unsigned int timeout_ms)
165
-
{
166
-
return intel_de_wait_ms(display, reg, mask, 0, timeout_ms, NULL);
167
-
}
89
+
int intel_de_wait_us(struct intel_display *display, i915_reg_t reg,
90
+
u32 mask, u32 value, unsigned int timeout_us,
91
+
u32 *out_value);
92
+
int intel_de_wait_ms(struct intel_display *display, i915_reg_t reg,
93
+
u32 mask, u32 value, unsigned int timeout_ms,
94
+
u32 *out_value);
95
+
int intel_de_wait_fw_ms(struct intel_display *display, i915_reg_t reg,
96
+
u32 mask, u32 value, unsigned int timeout_ms,
97
+
u32 *out_value);
98
+
int intel_de_wait_fw_us_atomic(struct intel_display *display, i915_reg_t reg,
99
+
u32 mask, u32 value, unsigned int timeout_us,
100
+
u32 *out_value);
101
+
int intel_de_wait_for_set_us(struct intel_display *display, i915_reg_t reg,
102
+
u32 mask, unsigned int timeout_us);
103
+
int intel_de_wait_for_clear_us(struct intel_display *display, i915_reg_t reg,
104
+
u32 mask, unsigned int timeout_us);
105
+
int intel_de_wait_for_set_ms(struct intel_display *display, i915_reg_t reg,
106
+
u32 mask, unsigned int timeout_ms);
107
+
int intel_de_wait_for_clear_ms(struct intel_display *display, i915_reg_t reg,
108
+
u32 mask, unsigned int timeout_ms);
168
109
169
110
/*
170
111
* Unlocked mmio-accessors, think carefully before using these.