drm/gma500: Rename psb_gtt_{pin,unpin}() to psb_gem_{pin,unpin}()

Rename psb_gtt_pin() to psb_gem_pin() to reflect the semantics of the
function. Same for psb_gtt_unpin(). No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211015084053.13708-6-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 97b7f3b..1905468 100644 (file)
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -52,7 +52,7 @@ static void psb_gtt_detach_pages(struct gtt_range *gt)
        gt->pages = NULL;
 }
 
-int psb_gtt_pin(struct gtt_range *gt)
+int psb_gem_pin(struct gtt_range *gt)
 {
        int ret = 0;
        struct drm_device *dev = gt->gem.dev;
@@ -80,7 +80,7 @@ out:
        return ret;
 }
 
-void psb_gtt_unpin(struct gtt_range *gt)
+void psb_gem_unpin(struct gtt_range *gt)
 {
        struct drm_device *dev = gt->gem.dev;
        struct drm_psb_private *dev_priv = to_drm_psb_private(dev);
@@ -105,7 +105,7 @@ static void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt)
 {
        /* Undo the mmap pin if we are destroying the object */
        if (gt->mmapping) {
-               psb_gtt_unpin(gt);
+               psb_gem_unpin(gt);
                gt->mmapping = 0;
        }
        WARN_ON(gt->in_gart && !gt->stolen);
@@ -301,7 +301,7 @@ static vm_fault_t psb_gem_fault(struct vm_fault *vmf)
        /* For now the mmap pins the object and it stays pinned. As things
           stand that will do us no harm */
        if (r->mmapping == 0) {
-               err = psb_gtt_pin(r);
+               err = psb_gem_pin(r);
                if (err < 0) {
                        dev_err(dev->dev, "gma500: pin failed: %d\n", err);
                        ret = vmf_error(err);

diff --git a/drivers/gpu/drm/gma500/gem.h b/drivers/gpu/drm/gma500/gem.h
index 6b67c58..21c86df 100644 (file)
--- a/drivers/gpu/drm/gma500/gem.h
+++ b/drivers/gpu/drm/gma500/gem.h
@@ -15,7 +15,7 @@ struct drm_device;
 struct gtt_range *
 psb_gem_create(struct drm_device *dev, u64 size, const char *name, bool stolen, u32 align);
 
-int psb_gtt_pin(struct gtt_range *gt);
-void psb_gtt_unpin(struct gtt_range *gt);
+int psb_gem_pin(struct gtt_range *gt);
+void psb_gem_unpin(struct gtt_range *gt);
 
 #endif

diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 8c95b50..6d0470b 100644 (file)
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -75,7 +75,7 @@ int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 
        /* We are displaying this buffer, make sure it is actually loaded
           into the GTT */
-       ret = psb_gtt_pin(gtt);
+       ret = psb_gem_pin(gtt);
        if (ret < 0)
                goto gma_pipe_set_base_exit;
        start = gtt->offset;
@@ -126,7 +126,7 @@ int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 gma_pipe_cleaner:
        /* If there was a previous display we can now unpin it */
        if (old_fb)
-               psb_gtt_unpin(to_gtt_range(old_fb->obj[0]));
+               psb_gem_unpin(to_gtt_range(old_fb->obj[0]));
 
 gma_pipe_set_base_exit:
        gma_power_end(dev);
@@ -350,7 +350,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
                /* Unpin the old GEM object */
                if (gma_crtc->cursor_obj) {
                        gt = to_gtt_range(gma_crtc->cursor_obj);
-                       psb_gtt_unpin(gt);
+                       psb_gem_unpin(gt);
                        drm_gem_object_put(gma_crtc->cursor_obj);
                        gma_crtc->cursor_obj = NULL;
                }
@@ -378,7 +378,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
        gt = to_gtt_range(obj);
 
        /* Pin the memory into the GTT */
-       ret = psb_gtt_pin(gt);
+       ret = psb_gem_pin(gt);
        if (ret) {
                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
                goto unref_cursor;
@@ -426,7 +426,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
        /* unpin the old bo */
        if (gma_crtc->cursor_obj) {
                gt = to_gtt_range(gma_crtc->cursor_obj);
-               psb_gtt_unpin(gt);
+               psb_gem_unpin(gt);
                drm_gem_object_put(gma_crtc->cursor_obj);
        }
 
@@ -490,7 +490,7 @@ void gma_crtc_disable(struct drm_crtc *crtc)
 
        if (crtc->primary->fb) {
                gt = to_gtt_range(crtc->primary->fb->obj[0]);
-               psb_gtt_unpin(gt);
+               psb_gem_unpin(gt);
        }
 }