drm/amdgpu: rename amdgpu_framebuffer_init

Add display to the name for consistency.

Signed-off-by: Samuel Li <Samuel.Li@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index dfe8a96ac54d83607c57abaafd6939fd43be3141..51e59cc07b8a67aa85514ffd9c78ac4f393eea42 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -520,11 +520,10 @@ uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
        return domain;
 }
 
-int
-amdgpu_framebuffer_init(struct drm_device *dev,
-                       struct amdgpu_framebuffer *rfb,
-                       const struct drm_mode_fb_cmd2 *mode_cmd,
-                       struct drm_gem_object *obj)
+int amdgpu_display_framebuffer_init(struct drm_device *dev,
+                                   struct amdgpu_framebuffer *rfb,
+                                   const struct drm_mode_fb_cmd2 *mode_cmd,
+                                   struct drm_gem_object *obj)
 {
        int ret;
        rfb->obj = obj;
@@ -565,7 +564,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
                return ERR_PTR(-ENOMEM);
        }
 
-       ret = amdgpu_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj);
+       ret = amdgpu_display_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj);
        if (ret) {
                kfree(amdgpu_fb);
                drm_gem_object_put_unlocked(obj);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index a7423dd692b8b53a18332405c9e24ed763e9af08..12063019751bf4e5221834b046144d2482b5d1c7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -227,7 +227,8 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
        info->par = rfbdev;
        info->skip_vt_switch = true;
 
-       ret = amdgpu_framebuffer_init(adev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
+       ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb,
+                                             &mode_cmd, gobj);
        if (ret) {
                DRM_ERROR("failed to initialize framebuffer %d\n", ret);
                goto out;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 84d319ef5e9263f6798b5575317d097c71d24735..e4d3aa7faad2149f7487a1c0ae9b04e127c8fd9e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -637,10 +637,10 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
                               ktime_t *stime, ktime_t *etime,
                               const struct drm_display_mode *mode);
 
-int amdgpu_framebuffer_init(struct drm_device *dev,
-                            struct amdgpu_framebuffer *rfb,
-                            const struct drm_mode_fb_cmd2 *mode_cmd,
-                            struct drm_gem_object *obj);
+int amdgpu_display_framebuffer_init(struct drm_device *dev,
+                                   struct amdgpu_framebuffer *rfb,
+                                   const struct drm_mode_fb_cmd2 *mode_cmd,
+                                   struct drm_gem_object *obj);
 
 int amdgpufb_remove(struct drm_device *dev, struct drm_framebuffer *fb);