diff options
author | Samuel Li <Samuel.Li@amd.com> | 2018-01-19 12:17:42 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:18:25 -0500 |
commit | 9da3f2d93438b625de07e12b952b4371025e1008 (patch) | |
tree | 857424306233c9f1b58086f7b04a99783a894c05 /drivers/gpu/drm/amd | |
parent | e0b5b5ec0bc7b12c019560dade29c79208626768 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index dfe8a96ac54d..51e59cc07b8a 100644 --- 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) | |||
520 | return domain; | 520 | return domain; |
521 | } | 521 | } |
522 | 522 | ||
523 | int | 523 | int amdgpu_display_framebuffer_init(struct drm_device *dev, |
524 | amdgpu_framebuffer_init(struct drm_device *dev, | 524 | struct amdgpu_framebuffer *rfb, |
525 | struct amdgpu_framebuffer *rfb, | 525 | const struct drm_mode_fb_cmd2 *mode_cmd, |
526 | const struct drm_mode_fb_cmd2 *mode_cmd, | 526 | struct drm_gem_object *obj) |
527 | struct drm_gem_object *obj) | ||
528 | { | 527 | { |
529 | int ret; | 528 | int ret; |
530 | rfb->obj = obj; | 529 | rfb->obj = obj; |
@@ -565,7 +564,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, | |||
565 | return ERR_PTR(-ENOMEM); | 564 | return ERR_PTR(-ENOMEM); |
566 | } | 565 | } |
567 | 566 | ||
568 | ret = amdgpu_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj); | 567 | ret = amdgpu_display_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj); |
569 | if (ret) { | 568 | if (ret) { |
570 | kfree(amdgpu_fb); | 569 | kfree(amdgpu_fb); |
571 | drm_gem_object_put_unlocked(obj); | 570 | 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 a7423dd692b8..12063019751b 100644 --- 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, | |||
227 | info->par = rfbdev; | 227 | info->par = rfbdev; |
228 | info->skip_vt_switch = true; | 228 | info->skip_vt_switch = true; |
229 | 229 | ||
230 | ret = amdgpu_framebuffer_init(adev->ddev, &rfbdev->rfb, &mode_cmd, gobj); | 230 | ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb, |
231 | &mode_cmd, gobj); | ||
231 | if (ret) { | 232 | if (ret) { |
232 | DRM_ERROR("failed to initialize framebuffer %d\n", ret); | 233 | DRM_ERROR("failed to initialize framebuffer %d\n", ret); |
233 | goto out; | 234 | goto out; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index 84d319ef5e92..e4d3aa7faad2 100644 --- 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, | |||
637 | ktime_t *stime, ktime_t *etime, | 637 | ktime_t *stime, ktime_t *etime, |
638 | const struct drm_display_mode *mode); | 638 | const struct drm_display_mode *mode); |
639 | 639 | ||
640 | int amdgpu_framebuffer_init(struct drm_device *dev, | 640 | int amdgpu_display_framebuffer_init(struct drm_device *dev, |
641 | struct amdgpu_framebuffer *rfb, | 641 | struct amdgpu_framebuffer *rfb, |
642 | const struct drm_mode_fb_cmd2 *mode_cmd, | 642 | const struct drm_mode_fb_cmd2 *mode_cmd, |
643 | struct drm_gem_object *obj); | 643 | struct drm_gem_object *obj); |
644 | 644 | ||
645 | int amdgpufb_remove(struct drm_device *dev, struct drm_framebuffer *fb); | 645 | int amdgpufb_remove(struct drm_device *dev, struct drm_framebuffer *fb); |
646 | 646 | ||