[PATCH] drm/amd/display: Remove fb_location parameter from get_fb_info

[Christian König]

Am 26.10.2017 um 17:09 schrieb Michel Dänzer:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> It's dead code.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Just wanted to do the same thing while working on GART scanout on CZ.

Patch is Reviewed-by: Christian König <christian.koenig at amd.com>.

Christian.

> ---
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 21 ++++++---------------
>   1 file changed, 6 insertions(+), 15 deletions(-)
>
> 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 91876e0fd85b..f2e3c37845fc 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1746,8 +1746,7 @@ static bool fill_rects_from_plane_state(const struct drm_plane_state *state,
>   	return true;
>   }
>   static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
> -		       uint64_t *tiling_flags,
> -		       uint64_t *fb_location)
> +		       uint64_t *tiling_flags)
>   {
>   	struct amdgpu_bo *rbo = gem_to_amdgpu_bo(amdgpu_fb->obj);
>   	int r = amdgpu_bo_reserve(rbo, false);
> @@ -1759,9 +1758,6 @@ static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
>   		return r;
>   	}
>   
> -	if (fb_location)
> -		*fb_location = amdgpu_bo_gpu_offset(rbo);
> -
>   	if (tiling_flags)
>   		amdgpu_bo_get_tiling_flags(rbo, tiling_flags);
>   
> @@ -1772,8 +1768,7 @@ static int get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb,
>   
>   static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
>   					 struct dc_plane_state *plane_state,
> -					 const struct amdgpu_framebuffer *amdgpu_fb,
> -					 bool addReq)
> +					 const struct amdgpu_framebuffer *amdgpu_fb)
>   {
>   	uint64_t tiling_flags;
>   	uint64_t fb_location = 0;
> @@ -1785,8 +1780,7 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
>   
>   	ret = get_fb_info(
>   		amdgpu_fb,
> -		&tiling_flags,
> -		addReq == true ? &fb_location:NULL);
> +		&tiling_flags);
>   
>   	if (ret)
>   		return ret;
> @@ -1956,8 +1950,7 @@ static void fill_gamma_from_crtc_state(const struct drm_crtc_state *crtc_state,
>   static int fill_plane_attributes(struct amdgpu_device *adev,
>   				 struct dc_plane_state *dc_plane_state,
>   				 struct drm_plane_state *plane_state,
> -				 struct drm_crtc_state *crtc_state,
> -				 bool addrReq)
> +				 struct drm_crtc_state *crtc_state)
>   {
>   	const struct amdgpu_framebuffer *amdgpu_fb =
>   		to_amdgpu_framebuffer(plane_state->fb);
> @@ -1971,8 +1964,7 @@ static int fill_plane_attributes(struct amdgpu_device *adev,
>   	ret = fill_plane_attributes_from_fb(
>   		crtc->dev->dev_private,
>   		dc_plane_state,
> -		amdgpu_fb,
> -		addrReq);
> +		amdgpu_fb);
>   
>   	if (ret)
>   		return ret;
> @@ -4663,8 +4655,7 @@ static int dm_update_planes_state(struct dc *dc,
>   				new_plane_crtc->dev->dev_private,
>   				dm_new_plane_state->dc_state,
>   				new_plane_state,
> -				new_crtc_state,
> -				false);
> +				new_crtc_state);
>   			if (ret)
>   				return ret;
>