Commit 228a10d4 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display move get_num_odm_splits() into dc_resource.c 



It's used by more than just DCN2.0.  Fixes missing symbol when
amdgpu is built without DCN support.

Reviewed-by: default avatarZhan Liu <zhan.liu@amd.com>
Tested-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf2156e2

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+16 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+0 −16
Original line number Diff line number Diff line
@@ -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)

{

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h

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

drivers/gpu/drm/amd/display/dc/inc/resource.h

+3 −0
Original line number Diff line number Diff line
@@ -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_ */