tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/de: Implement register waits one way
Currently we use a messy mix of intel_wait_for_register*()
and __intel_wait_for_register*() to implement various
register polling functions. Make the mess a bit more understandable
by always using the __intel_wait_for_register*() stuff.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251110172756.2132-2-ville.syrjala@linux.intel.com
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
+14
-34
+4
-13
drivers/gpu/drm/i915/display/intel_de.h
+4
-13
drivers/gpu/drm/i915/display/intel_de.h
···
105
105
}
106
106
107
107
static inline int
108
-
__intel_de_wait_for_register_nowl(struct intel_display *display,
109
-
i915_reg_t reg,
110
-
u32 mask, u32 value, unsigned int timeout_ms)
111
-
{
112
-
return intel_wait_for_register(__to_uncore(display), reg, mask,
113
-
value, timeout_ms);
114
-
}
115
-
116
-
static inline int
117
108
__intel_de_wait_for_register_atomic_nowl(struct intel_display *display,
118
109
i915_reg_t reg,
119
110
u32 mask, u32 value,
···
122
131
123
132
intel_dmc_wl_get(display, reg);
124
133
125
-
ret = __intel_de_wait_for_register_nowl(display, reg, mask, value,
126
-
timeout_ms);
134
+
ret = __intel_wait_for_register(__to_uncore(display), reg, mask,
135
+
value, 2, timeout_ms, NULL);
127
136
128
137
intel_dmc_wl_put(display, reg);
129
138
···
138
147
139
148
intel_dmc_wl_get(display, reg);
140
149
141
-
ret = intel_wait_for_register_fw(__to_uncore(display), reg, mask,
142
-
value, timeout_ms, out_value);
150
+
ret = __intel_wait_for_register_fw(__to_uncore(display), reg, mask,
151
+
value, 2, timeout_ms, out_value);
143
152
144
153
intel_dmc_wl_put(display, reg);
145
154
+10
-21
drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
+10
-21
drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
···
91
91
return xe_mmio_rmw32(__compat_uncore_to_mmio(uncore), reg, clear, set);
92
92
}
93
93
94
-
static inline int intel_wait_for_register(struct intel_uncore *uncore,
95
-
i915_reg_t i915_reg, u32 mask,
96
-
u32 value, unsigned int timeout)
97
-
{
98
-
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
99
-
100
-
return xe_mmio_wait32(__compat_uncore_to_mmio(uncore), reg, mask, value,
101
-
timeout * USEC_PER_MSEC, NULL, false);
102
-
}
103
-
104
-
static inline int intel_wait_for_register_fw(struct intel_uncore *uncore,
105
-
i915_reg_t i915_reg, u32 mask,
106
-
u32 value, unsigned int timeout,
107
-
u32 *out_value)
108
-
{
109
-
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
110
-
111
-
return xe_mmio_wait32(__compat_uncore_to_mmio(uncore), reg, mask, value,
112
-
timeout * USEC_PER_MSEC, out_value, false);
113
-
}
114
-
115
94
static inline int
116
95
__intel_wait_for_register(struct intel_uncore *uncore, i915_reg_t i915_reg,
117
96
u32 mask, u32 value, unsigned int fast_timeout_us,
···
110
131
return xe_mmio_wait32(__compat_uncore_to_mmio(uncore), reg, mask, value,
111
132
fast_timeout_us + 1000 * slow_timeout_ms,
112
133
out_value, atomic);
134
+
}
135
+
136
+
static inline int
137
+
__intel_wait_for_register_fw(struct intel_uncore *uncore, i915_reg_t i915_reg,
138
+
u32 mask, u32 value, unsigned int fast_timeout_us,
139
+
unsigned int slow_timeout_ms, u32 *out_value)
140
+
{
141
+
return __intel_wait_for_register(uncore, i915_reg, mask, value,
142
+
fast_timeout_us, slow_timeout_ms,
143
+
out_value);
113
144
}
114
145
115
146
static inline u32 intel_uncore_read_fw(struct intel_uncore *uncore,