[PATCH 3/3] drm/amdgpu/display move get_num_odm_splits() into dc_resource.c

[Rodrigo Siqueira]

Tested-by: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>
On 02/11, Alex Deucher wrote:
> It's used by more than just DCN2.0.  Fixes missing symbol when
> amdgpu is built without DCN support.
> 
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  .../gpu/drm/amd/display/dc/core/dc_resource.c    | 16 ++++++++++++++++
>  .../drm/amd/display/dc/dcn20/dcn20_resource.c    | 16 ----------------
>  .../drm/amd/display/dc/dcn20/dcn20_resource.h    |  1 -
>  drivers/gpu/drm/amd/display/dc/inc/resource.h    |  3 +++
>  4 files changed, 19 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index c02e5994d32b..572ce3842535 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -532,6 +532,22 @@ static inline void get_vp_scan_direction(
>  		*flip_horz_scan_dir = !*flip_horz_scan_dir;
>  }
>  
> +int get_num_odm_splits(struct pipe_ctx *pipe)
> +{
> +	int odm_split_count = 0;
> +	struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> +	while (next_pipe) {
> +		odm_split_count++;
> +		next_pipe = next_pipe->next_odm_pipe;
> +	}
> +	pipe = pipe->prev_odm_pipe;
> +	while (pipe) {
> +		odm_split_count++;
> +		pipe = pipe->prev_odm_pipe;
> +	}
> +	return odm_split_count;
> +}
> +
>  static void calculate_split_count_and_index(struct pipe_ctx *pipe_ctx, int *split_count, int *split_idx)
>  {
>  	*split_count = get_num_odm_splits(pipe_ctx);
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 39026df56fa6..1061faccec9c 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -1861,22 +1861,6 @@ void dcn20_populate_dml_writeback_from_context(
>  
>  }
>  
> -int get_num_odm_splits(struct pipe_ctx *pipe)
> -{
> -	int odm_split_count = 0;
> -	struct pipe_ctx *next_pipe = pipe->next_odm_pipe;
> -	while (next_pipe) {
> -		odm_split_count++;
> -		next_pipe = next_pipe->next_odm_pipe;
> -	}
> -	pipe = pipe->prev_odm_pipe;
> -	while (pipe) {
> -		odm_split_count++;
> -		pipe = pipe->prev_odm_pipe;
> -	}
> -	return odm_split_count;
> -}
> -
>  int dcn20_populate_dml_pipes_from_context(
>  		struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes)
>  {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> index 5180088ab6bc..f5893840b79b 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h
> @@ -49,7 +49,6 @@ unsigned int dcn20_calc_max_scaled_time(
>  		unsigned int time_per_pixel,
>  		enum mmhubbub_wbif_mode mode,
>  		unsigned int urgent_watermark);
> -int get_num_odm_splits(struct pipe_ctx *pipe);
>  int dcn20_populate_dml_pipes_from_context(
>  		struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes);
>  struct pipe_ctx *dcn20_acquire_idle_pipe_for_layer(
> diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> index 5ae8ada154ef..ca4c36c0c9bc 100644
> --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
> +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
> @@ -179,4 +179,7 @@ unsigned int resource_pixel_format_to_bpp(enum surface_pixel_format format);
>  
>  void get_audio_check(struct audio_info *aud_modes,
>  	struct audio_check *aud_chk);
> +
> +int get_num_odm_splits(struct pipe_ctx *pipe);
> +
>  #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */
> -- 
> 2.24.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CRodrigo.Siqueira%40amd.com%7Ce2697beeff3847ea057408d7af74b286%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637170788143697503&sdata=XUELq7%2FDPfX%2FifA635o5DUd09JSwzPIXZkYjB107Jk8%3D&reserved=0

-- 
Rodrigo Siqueira
Software Engineer, Advanced Micro Devices (AMD)
https://siqueira.tech
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20200212/81236d5e/attachment-0001.sig>