mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 02:53:36 +02:00
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>
This commit is contained in:
parent
5c6905c73a
commit
9044001dd1
|
|
@ -284,7 +284,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
|
|||
} else {
|
||||
unsigned int alignment = intel_plane_fb_min_alignment(plane_state);
|
||||
|
||||
vma = intel_dpt_pin_to_ggtt(fb->dpt_vm, alignment / 512);
|
||||
vma = i915_dpt_pin_to_ggtt(fb->dpt_vm, alignment / 512);
|
||||
if (IS_ERR(vma))
|
||||
return PTR_ERR(vma);
|
||||
|
||||
|
|
@ -294,7 +294,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
|
|||
alignment, &plane_state->flags,
|
||||
fb->dpt_vm);
|
||||
if (IS_ERR(vma)) {
|
||||
intel_dpt_unpin_from_ggtt(fb->dpt_vm);
|
||||
i915_dpt_unpin_from_ggtt(fb->dpt_vm);
|
||||
plane_state->ggtt_vma = NULL;
|
||||
return PTR_ERR(vma);
|
||||
}
|
||||
|
|
@ -307,7 +307,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
|
|||
* The DPT object contains only one vma, and there is no VT-d
|
||||
* guard, so the VMA's offset within the DPT is always 0.
|
||||
*/
|
||||
drm_WARN_ON(display->drm, intel_dpt_offset(plane_state->dpt_vma));
|
||||
drm_WARN_ON(display->drm, i915_dpt_offset(plane_state->dpt_vma));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -346,7 +346,7 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
|
|||
|
||||
vma = fetch_and_zero(&old_plane_state->ggtt_vma);
|
||||
if (vma)
|
||||
intel_dpt_unpin_from_ggtt(fb->dpt_vm);
|
||||
i915_dpt_unpin_from_ggtt(fb->dpt_vm);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -121,8 +121,7 @@ static void dpt_cleanup(struct i915_address_space *vm)
|
|||
i915_gem_object_put(dpt->obj);
|
||||
}
|
||||
|
||||
struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
|
||||
unsigned int alignment)
|
||||
struct i915_vma *i915_dpt_pin_to_ggtt(struct i915_address_space *vm, unsigned int alignment)
|
||||
{
|
||||
struct drm_i915_private *i915 = vm->i915;
|
||||
struct intel_display *display = i915->display;
|
||||
|
|
@ -174,7 +173,7 @@ struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
|
|||
return err ? ERR_PTR(err) : vma;
|
||||
}
|
||||
|
||||
void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm)
|
||||
void i915_dpt_unpin_from_ggtt(struct i915_address_space *vm)
|
||||
{
|
||||
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
|
||||
|
||||
|
|
@ -265,7 +264,7 @@ static void i915_dpt_resume(struct i915_address_space *vm)
|
|||
i915_ggtt_resume_vm(vm, true);
|
||||
}
|
||||
|
||||
u64 intel_dpt_offset(struct i915_vma *dpt_vma)
|
||||
u64 i915_dpt_offset(struct i915_vma *dpt_vma)
|
||||
{
|
||||
return i915_vma_offset(dpt_vma);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,9 @@
|
|||
struct i915_address_space;
|
||||
struct i915_vma;
|
||||
|
||||
struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
|
||||
unsigned int alignment);
|
||||
void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm);
|
||||
u64 intel_dpt_offset(struct i915_vma *dpt_vma);
|
||||
struct i915_vma *i915_dpt_pin_to_ggtt(struct i915_address_space *vm, unsigned int alignment);
|
||||
void i915_dpt_unpin_from_ggtt(struct i915_address_space *vm);
|
||||
u64 i915_dpt_offset(struct i915_vma *dpt_vma);
|
||||
|
||||
extern const struct intel_display_dpt_interface i915_display_dpt_interface;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user