Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/display: drop some unnecessary intel_de_* compatibility wrappers
intel_de_wait_for_set(), intel_de_wait_for_clear(), intel_de_read_fw(),
and intel_de_write_fw() are only passed struct intel_display. Remove the
unnecessary compatibility wrappers.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/35589d84ee7996f8972ddb3ebc1aae1b53077b19.1742906146.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+6
-10
+6
-10
drivers/gpu/drm/i915/display/intel_de.h
+6
-10
drivers/gpu/drm/i915/display/intel_de.h
···
181
181
}
182
182
183
183
static inline int
184
-
__intel_de_wait_for_set(struct intel_display *display, i915_reg_t reg,
185
-
u32 mask, unsigned int timeout)
184
+
intel_de_wait_for_set(struct intel_display *display, i915_reg_t reg,
185
+
u32 mask, unsigned int timeout)
186
186
{
187
187
return intel_de_wait(display, reg, mask, mask, timeout);
188
188
}
189
-
#define intel_de_wait_for_set(p,...) __intel_de_wait_for_set(__to_intel_display(p), __VA_ARGS__)
190
189
191
190
static inline int
192
-
__intel_de_wait_for_clear(struct intel_display *display, i915_reg_t reg,
193
-
u32 mask, unsigned int timeout)
191
+
intel_de_wait_for_clear(struct intel_display *display, i915_reg_t reg,
192
+
u32 mask, unsigned int timeout)
194
193
{
195
194
return intel_de_wait(display, reg, mask, 0, timeout);
196
195
}
197
-
#define intel_de_wait_for_clear(p,...) __intel_de_wait_for_clear(__to_intel_display(p), __VA_ARGS__)
198
196
199
197
/*
200
198
* Unlocked mmio-accessors, think carefully before using these.
···
203
205
* a more localised lock guarding all access to that bank of registers.
204
206
*/
205
207
static inline u32
206
-
__intel_de_read_fw(struct intel_display *display, i915_reg_t reg)
208
+
intel_de_read_fw(struct intel_display *display, i915_reg_t reg)
207
209
{
208
210
u32 val;
209
211
···
212
214
213
215
return val;
214
216
}
215
-
#define intel_de_read_fw(p,...) __intel_de_read_fw(__to_intel_display(p), __VA_ARGS__)
216
217
217
218
static inline void
218
-
__intel_de_write_fw(struct intel_display *display, i915_reg_t reg, u32 val)
219
+
intel_de_write_fw(struct intel_display *display, i915_reg_t reg, u32 val)
219
220
{
220
221
trace_i915_reg_rw(true, reg, val, sizeof(val), true);
221
222
intel_uncore_write_fw(__to_uncore(display), reg, val);
222
223
}
223
-
#define intel_de_write_fw(p,...) __intel_de_write_fw(__to_intel_display(p), __VA_ARGS__)
224
224
225
225
static inline u32
226
226
intel_de_read_notrace(struct intel_display *display, i915_reg_t reg)