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>

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 5d4ae8be5ca606d32f8e6078e7a9eddc5c9b4727..d2e4200f2cefe63815844f54c49bca54cb09c01c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -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);
        }
 }
 

diff --git a/drivers/gpu/drm/i915/i915_dpt.c b/drivers/gpu/drm/i915/i915_dpt.c
index 8b49ebeecff76a1df16355bdd2755dbab4858644..b8a03c0498d2494b4db7d51d50aa14905df44535 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dpt.c
+++ b/drivers/gpu/drm/i915/i915_dpt.c
@@ -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);
 }

diff --git a/drivers/gpu/drm/i915/i915_dpt.h b/drivers/gpu/drm/i915/i915_dpt.h
index 9b765bc8d88bf2bd6fb9cd9f06d2c087a03fa38e..3b76e976060015f6f3833c10ae97dadb1bccdfc2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dpt.h
+++ b/drivers/gpu/drm/i915/i915_dpt.h
@@ -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;