Commit 9da3f2d9 authored by Samuel Li's avatar Samuel Li Committed by Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_framebuffer_init 



Add display to the name for consistency.

Signed-off-by: default avatarSamuel Li <Samuel.Li@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e0b5b5ec

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+5 −6
Original line number Diff line number Diff line
@@ -520,8 +520,7 @@ uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev) 
	return domain;

}



int

amdgpu_framebuffer_init(struct drm_device *dev,

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)
@@ -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);

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+4 −4
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ 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,

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);