Re: [PATCH 9/9] drm/i915: Rename the fb pinning functions to indicate the address space

2024-05-10 Thread Jani Nikula 
On Mon, 06 May 2024, Ville Syrjala  wrote:
> From: Ville Syrjälä 
>
> Rename the fb pinning functions such that their name directly
> informs us what gets pinned into which address space.
>
> Signed-off-by: Ville Syrjälä 

Reviewed-by: Jani Nikula 

> ---
>  drivers/gpu/drm/i915/display/intel_dpt.c  |  6 +--
>  drivers/gpu/drm/i915/display/intel_dpt.h  |  6 +--
>  drivers/gpu/drm/i915/display/intel_fb_pin.c   | 46 +--
>  drivers/gpu/drm/i915/display/intel_fb_pin.h   | 12 ++---
>  drivers/gpu/drm/i915/display/intel_fbdev.c|  8 ++--
>  drivers/gpu/drm/xe/display/xe_fb_pin.c| 12 ++---
>  drivers/gpu/drm/xe/display/xe_plane_initial.c |  4 +-
>  7 files changed, 47 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c 
> b/drivers/gpu/drm/i915/display/intel_dpt.c
> index 786d3f2e94c7..73a1918e2537 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpt.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpt.c
> @@ -121,8 +121,8 @@ static void dpt_cleanup(struct i915_address_space *vm)
>   i915_gem_object_put(dpt->obj);
>  }
>  
> -struct i915_vma *intel_dpt_pin(struct i915_address_space *vm,
> -unsigned int alignment)
> +struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
> +unsigned int alignment)
>  {
>   struct drm_i915_private *i915 = vm->i915;
>   struct i915_dpt *dpt = i915_vm_to_dpt(vm);
> @@ -173,7 +173,7 @@ struct i915_vma *intel_dpt_pin(struct i915_address_space 
> *vm,
>   return err ? ERR_PTR(err) : vma;
>  }
>  
> -void intel_dpt_unpin(struct i915_address_space *vm)
> +void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm)
>  {
>   struct i915_dpt *dpt = i915_vm_to_dpt(vm);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_dpt.h 
> b/drivers/gpu/drm/i915/display/intel_dpt.h
> index f467578a4950..ff18a525bfbe 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpt.h
> +++ b/drivers/gpu/drm/i915/display/intel_dpt.h
> @@ -13,9 +13,9 @@ struct i915_vma;
>  struct intel_framebuffer;
>  
>  void intel_dpt_destroy(struct i915_address_space *vm);
> -struct i915_vma *intel_dpt_pin(struct i915_address_space *vm,
> -unsigned int alignment);
> -void intel_dpt_unpin(struct i915_address_space *vm);
> +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);
>  void intel_dpt_suspend(struct drm_i915_private *i915);
>  void intel_dpt_resume(struct drm_i915_private *i915);
>  struct i915_address_space *
> diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c 
> b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> index 7971656982a6..1acc11fa19f4 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> @@ -18,11 +18,11 @@
>  #include "intel_fb_pin.h"
>  
>  static struct i915_vma *
> -intel_pin_fb_obj_dpt(const struct drm_framebuffer *fb,
> -  const struct i915_gtt_view *view,
> -  unsigned int alignment,
> -  unsigned long *out_flags,
> -  struct i915_address_space *vm)
> +intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
> + const struct i915_gtt_view *view,
> + unsigned int alignment,
> + unsigned long *out_flags,
> + struct i915_address_space *vm)
>  {
>   struct drm_device *dev = fb->dev;
>   struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -102,11 +102,11 @@ intel_pin_fb_obj_dpt(const struct drm_framebuffer *fb,
>  }
>  
>  struct i915_vma *
> -intel_pin_and_fence_fb_obj(const struct drm_framebuffer *fb,
> -bool phys_cursor,
> -const struct i915_gtt_view *view,
> -bool uses_fence,
> -unsigned long *out_flags)
> +intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> +  bool phys_cursor,
> +  const struct i915_gtt_view *view,
> +  bool uses_fence,
> +  unsigned long *out_flags)
>  {
>   struct drm_device *dev = fb->dev;
>   struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -226,7 +226,7 @@ intel_pin_and_fence_fb_obj(const struct drm_framebuffer 
> *fb,
>   return vma;
>  }
>  
> -void intel_unpin_fb_vma(struct i915_vma *vma, unsigned long flags)
> +void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
>  {
>   if (flags & PLANE_HAS_FENCE)
>   i915_vma_unpin_fence(vma);
> @@ -242,10 +242,10 @@ int intel_plane_pin_fb(struct intel_plane_state 
> *plane_state)
>   struct i915_vma *vma;
>  
>   if (!intel_fb_uses_dpt(>base)) {
> - vma = intel_pin_and_fence_fb_obj(>base, 
> intel_plane_needs_physical(plane),
> -

[PATCH 9/9] drm/i915: Rename the fb pinning functions to indicate the address space

2024-05-06 Thread Ville Syrjala 
From: Ville Syrjälä 

Rename the fb pinning functions such that their name directly
informs us what gets pinned into which address space.

Signed-off-by: Ville Syrjälä 
---
 drivers/gpu/drm/i915/display/intel_dpt.c  |  6 +--
 drivers/gpu/drm/i915/display/intel_dpt.h  |  6 +--
 drivers/gpu/drm/i915/display/intel_fb_pin.c   | 46 +--
 drivers/gpu/drm/i915/display/intel_fb_pin.h   | 12 ++---
 drivers/gpu/drm/i915/display/intel_fbdev.c|  8 ++--
 drivers/gpu/drm/xe/display/xe_fb_pin.c| 12 ++---
 drivers/gpu/drm/xe/display/xe_plane_initial.c |  4 +-
 7 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c 
b/drivers/gpu/drm/i915/display/intel_dpt.c
index 786d3f2e94c7..73a1918e2537 100644
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -121,8 +121,8 @@ static void dpt_cleanup(struct i915_address_space *vm)
i915_gem_object_put(dpt->obj);
 }
 
-struct i915_vma *intel_dpt_pin(struct i915_address_space *vm,
-  unsigned int alignment)
+struct i915_vma *intel_dpt_pin_to_ggtt(struct i915_address_space *vm,
+  unsigned int alignment)
 {
struct drm_i915_private *i915 = vm->i915;
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
@@ -173,7 +173,7 @@ struct i915_vma *intel_dpt_pin(struct i915_address_space 
*vm,
return err ? ERR_PTR(err) : vma;
 }
 
-void intel_dpt_unpin(struct i915_address_space *vm)
+void intel_dpt_unpin_from_ggtt(struct i915_address_space *vm)
 {
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
 
diff --git a/drivers/gpu/drm/i915/display/intel_dpt.h 
b/drivers/gpu/drm/i915/display/intel_dpt.h
index f467578a4950..ff18a525bfbe 100644
--- a/drivers/gpu/drm/i915/display/intel_dpt.h
+++ b/drivers/gpu/drm/i915/display/intel_dpt.h
@@ -13,9 +13,9 @@ struct i915_vma;
 struct intel_framebuffer;
 
 void intel_dpt_destroy(struct i915_address_space *vm);
-struct i915_vma *intel_dpt_pin(struct i915_address_space *vm,
-  unsigned int alignment);
-void intel_dpt_unpin(struct i915_address_space *vm);
+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);
 void intel_dpt_suspend(struct drm_i915_private *i915);
 void intel_dpt_resume(struct drm_i915_private *i915);
 struct i915_address_space *
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c 
b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 7971656982a6..1acc11fa19f4 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -18,11 +18,11 @@
 #include "intel_fb_pin.h"
 
 static struct i915_vma *
-intel_pin_fb_obj_dpt(const struct drm_framebuffer *fb,
-const struct i915_gtt_view *view,
-unsigned int alignment,
-unsigned long *out_flags,
-struct i915_address_space *vm)
+intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
+   const struct i915_gtt_view *view,
+   unsigned int alignment,
+   unsigned long *out_flags,
+   struct i915_address_space *vm)
 {
struct drm_device *dev = fb->dev;
struct drm_i915_private *dev_priv = to_i915(dev);
@@ -102,11 +102,11 @@ intel_pin_fb_obj_dpt(const struct drm_framebuffer *fb,
 }
 
 struct i915_vma *
-intel_pin_and_fence_fb_obj(const struct drm_framebuffer *fb,
-  bool phys_cursor,
-  const struct i915_gtt_view *view,
-  bool uses_fence,
-  unsigned long *out_flags)
+intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
+bool phys_cursor,
+const struct i915_gtt_view *view,
+bool uses_fence,
+unsigned long *out_flags)
 {
struct drm_device *dev = fb->dev;
struct drm_i915_private *dev_priv = to_i915(dev);
@@ -226,7 +226,7 @@ intel_pin_and_fence_fb_obj(const struct drm_framebuffer *fb,
return vma;
 }
 
-void intel_unpin_fb_vma(struct i915_vma *vma, unsigned long flags)
+void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
 {
if (flags & PLANE_HAS_FENCE)
i915_vma_unpin_fence(vma);
@@ -242,10 +242,10 @@ int intel_plane_pin_fb(struct intel_plane_state 
*plane_state)
struct i915_vma *vma;
 
if (!intel_fb_uses_dpt(>base)) {
-   vma = intel_pin_and_fence_fb_obj(>base, 
intel_plane_needs_physical(plane),
-_state->view.gtt,
-
intel_plane_uses_fence(plane_state),
-_state->flags);
+   vma = intel_fb_pin_to_ggtt(>base,