[PATCH 1/3] drm/amdgpu: Rename amdgpu_display_framebuffer_domains()

[Christian König]

With Alex note addressed patch #1 & #2 are Reviewed-by: Christian König 
<christian.koenig at amd.com>

Regards,
Christian.

Am 18.04.2018 um 23:50 schrieb Samuel Li:
> It returns supported domains, and domains actually used are to be
> decided later.
>
> Signed-off-by: Samuel Li <Samuel.Li at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_display.c       | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_display.h       | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c            | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c         | 2 +-
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
>   5 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> index 50f98df..0caa3d2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> @@ -189,7 +189,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc,
>   		goto cleanup;
>   	}
>   
> -	r = amdgpu_bo_pin(new_abo, amdgpu_display_framebuffer_domains(adev), &base);
> +	r = amdgpu_bo_pin(new_abo, amdgpu_display_supported_domains(adev), &base);
>   	if (unlikely(r != 0)) {
>   		DRM_ERROR("failed to pin new abo buffer before flip\n");
>   		goto unreserve;
> @@ -484,7 +484,7 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
>   	.create_handle = drm_gem_fb_create_handle,
>   };
>   
> -uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
> +uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev)
>   {
>   	uint32_t domain = AMDGPU_GEM_DOMAIN_VRAM;
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
> index 2b11d80..f66e3e3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
> @@ -23,7 +23,7 @@
>   #ifndef __AMDGPU_DISPLAY_H__
>   #define __AMDGPU_DISPLAY_H__
>   
> -uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev);
> +uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev);
>   struct drm_framebuffer *
>   amdgpu_display_user_framebuffer_create(struct drm_device *dev,
>   				       struct drm_file *file_priv,
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> index ff89e84..bc5fd8e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> @@ -137,7 +137,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
>   	/* need to align pitch with crtc limits */
>   	mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, cpp,
>   						  fb_tiled);
> -	domain = amdgpu_display_framebuffer_domains(adev);
> +	domain = amdgpu_display_supported_domains(adev);
>   
>   	height = ALIGN(mode_cmd->height, 8);
>   	size = mode_cmd->pitches[0] * height;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
> index 4b584cb7..cf0749f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
> @@ -209,7 +209,7 @@ static int amdgpu_gem_begin_cpu_access(struct dma_buf *dma_buf,
>   	struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv);
>   	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
>   	struct ttm_operation_ctx ctx = { true, false };
> -	u32 domain = amdgpu_display_framebuffer_domains(adev);
> +	u32 domain = amdgpu_display_supported_domains(adev);
>   	int ret;
>   	bool reads = (direction == DMA_BIDIRECTIONAL ||
>   		      direction == DMA_FROM_DEVICE);
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 6f92a19..1f5603a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3109,12 +3109,11 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>   		return r;
>   
>   	if (plane->type != DRM_PLANE_TYPE_CURSOR)
> -		domain = amdgpu_display_framebuffer_domains(adev);
> +		domain = amdgpu_display_supported_domains(adev);
>   	else
>   		domain = AMDGPU_GEM_DOMAIN_VRAM;
>   
>   	r = amdgpu_bo_pin(rbo, domain, &afb->address);
> -
>   	amdgpu_bo_unreserve(rbo);
>   
>   	if (unlikely(r != 0)) {