Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/dpt: rename i915 specific functions to i915_dpt_ prefix
Follow the common convention of naming functions by file name, in this
case also clarifying which functions are i915 specific.
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patch.msgid.link/9bb94942ed4a15bcdd89be3f0029a2cb6cdf170d.1772030909.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+10
-12
+4
-4
drivers/gpu/drm/i915/display/intel_fb_pin.c
+4
-4
drivers/gpu/drm/i915/display/intel_fb_pin.c
···
284
284
} else {
285
285
unsigned int alignment = intel_plane_fb_min_alignment(plane_state);
286
286
287
-
vma = intel_dpt_pin_to_ggtt(fb->dpt_vm, alignment / 512);
287
+
vma = i915_dpt_pin_to_ggtt(fb->dpt_vm, alignment / 512);
288
288
if (IS_ERR(vma))
289
289
return PTR_ERR(vma);
290
290
···
294
294
alignment, &plane_state->flags,
295
295
fb->dpt_vm);
296
296
if (IS_ERR(vma)) {
297
-
intel_dpt_unpin_from_ggtt(fb->dpt_vm);
297
+
i915_dpt_unpin_from_ggtt(fb->dpt_vm);
298
298
plane_state->ggtt_vma = NULL;
299
299
return PTR_ERR(vma);
300
300
}
···
307
307
* The DPT object contains only one vma, and there is no VT-d
308
308
* guard, so the VMA's offset within the DPT is always 0.
309
309
*/
310
-
drm_WARN_ON(display->drm, intel_dpt_offset(plane_state->dpt_vma));
310
+
drm_WARN_ON(display->drm, i915_dpt_offset(plane_state->dpt_vma));
311
311
}
312
312
313
313
/*
···
346
346
347
347
vma = fetch_and_zero(&old_plane_state->ggtt_vma);
348
348
if (vma)
349
-
intel_dpt_unpin_from_ggtt(fb->dpt_vm);
349
+
i915_dpt_unpin_from_ggtt(fb->dpt_vm);
350
350
}
351
351
}
352
352
+3
-4
drivers/gpu/drm/i915/i915_dpt.c
+3
-4
drivers/gpu/drm/i915/i915_dpt.c
···
121
121
i915_gem_object_put(dpt->obj);
122
122
}
123
123
124
-
struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
125
-
unsigned int alignment)
124
+
struct i915_vma *i915_dpt_pin_to_ggtt(struct i915_address_space *vm, unsigned int alignment)
126
125
{
127
126
struct drm_i915_private *i915 = vm->i915;
128
127
struct intel_display *display = i915->display;
···
173
174
return err ? ERR_PTR(err) : vma;
174
175
}
175
176
176
-
void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm)
177
+
void i915_dpt_unpin_from_ggtt(struct i915_address_space *vm)
177
178
{
178
179
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
179
180
···
264
265
i915_ggtt_resume_vm(vm, true);
265
266
}
266
267
267
-
u64 intel_dpt_offset(struct i915_vma *dpt_vma)
268
+
u64 i915_dpt_offset(struct i915_vma *dpt_vma)
268
269
{
269
270
return i915_vma_offset(dpt_vma);
270
271
}
+3
-4
drivers/gpu/drm/i915/i915_dpt.h
+3
-4
drivers/gpu/drm/i915/i915_dpt.h
···
9
9
struct i915_address_space;
10
10
struct i915_vma;
11
11
12
-
struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
13
-
unsigned int alignment);
14
-
void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm);
15
-
u64 intel_dpt_offset(struct i915_vma *dpt_vma);
12
+
struct i915_vma *i915_dpt_pin_to_ggtt(struct i915_address_space *vm, unsigned int alignment);
13
+
void i915_dpt_unpin_from_ggtt(struct i915_address_space *vm);
14
+
u64 i915_dpt_offset(struct i915_vma *dpt_vma);
16
15
17
16
extern const struct intel_display_dpt_interface i915_display_dpt_interface;
18
17