Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e12cfcb1 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Roll core_surface into dc_surface 



Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 08b16886

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c

+4 −4
Original line number Diff line number Diff line
@@ -2345,7 +2345,7 @@ static void amdgpu_dm_commit_surfaces(struct drm_atomic_state *state, 
	struct drm_plane *plane;

	struct drm_plane_state *old_plane_state;

	const struct dc_stream *dc_stream_attach;

	const struct dc_surface *dc_surfaces_constructed[MAX_SURFACES];

	struct dc_surface *dc_surfaces_constructed[MAX_SURFACES];

	struct amdgpu_crtc *acrtc_attach = to_amdgpu_crtc(pcrtc);

	struct dm_crtc_state *acrtc_state = to_dm_crtc_state(pcrtc->state);

	int planes_count = 0;
@@ -2624,7 +2624,7 @@ void amdgpu_dm_atomic_commit_tail( 
		struct dm_connector_state *con_old_state =

				to_dm_connector_state(old_conn_state);

		struct amdgpu_crtc *acrtc = to_amdgpu_crtc(con_new_state->base.crtc);

		const struct dc_stream_status *status = NULL;

		struct dc_stream_status *status = NULL;



		/* Skip any modesets/resets */

		if (!acrtc || drm_atomic_crtc_needs_modeset(acrtc->base.state))
@@ -2649,7 +2649,7 @@ void amdgpu_dm_atomic_commit_tail( 
		/*TODO How it works with MPO ?*/

		if (!dc_commit_surfaces_to_stream(

				dm->dc,

				(const struct dc_surface **)status->surfaces,

				status->surfaces,

				status->surface_count,

				new_acrtc_state->stream))

			dm_error("%s: Failed to update stream scaling!\n", __func__);
@@ -2793,7 +2793,7 @@ static uint32_t add_val_sets_surface( 
	struct dc_validation_set *val_sets,

	uint32_t set_count,

	const struct dc_stream *stream,

	const struct dc_surface *surface)

	struct dc_surface *surface)

{

	uint32_t i = 0, j = 0;

drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c

+8 −8
Original line number Diff line number Diff line
@@ -2597,12 +2597,12 @@ static void populate_initial_data( 
		ASSERT(pipe[i].surface);



		if (num_displays == 0) {

			if (!pipe[i].surface->public.visible)

			if (!pipe[i].surface->visible)

				data->d0_underlay_mode = bw_def_underlay_only;

			else

				data->d0_underlay_mode = bw_def_blend;

		} else {

			if (!pipe[i].surface->public.visible)

			if (!pipe[i].surface->visible)

				data->d1_underlay_mode = bw_def_underlay_only;

			else

				data->d1_underlay_mode = bw_def_blend;
@@ -2620,7 +2620,7 @@ static void populate_initial_data( 
		data->v_taps[num_displays + 4] = bw_int_to_fixed(pipe[i].scl_data.taps.v_taps);

		data->h_scale_ratio[num_displays + 4] = fixed31_32_to_bw_fixed(pipe[i].scl_data.ratios.horz.value);

		data->v_scale_ratio[num_displays + 4] = fixed31_32_to_bw_fixed(pipe[i].scl_data.ratios.vert.value);

		switch (pipe[i].surface->public.rotation) {

		switch (pipe[i].surface->rotation) {

		case ROTATION_ANGLE_0:

			data->rotation_angle[num_displays + 4] = bw_int_to_fixed(0);

			break;
@@ -2636,7 +2636,7 @@ static void populate_initial_data( 
		default:

			break;

		}

		switch (pipe[i].surface->public.format) {

		switch (pipe[i].surface->format) {

		case SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr:

		case SURFACE_PIXEL_FORMAT_GRPH_ARGB1555:

		case SURFACE_PIXEL_FORMAT_GRPH_RGB565:
@@ -2670,14 +2670,14 @@ static void populate_initial_data( 
			data->src_height[num_displays * 2 + j] = bw_int_to_fixed(pipe[i].bottom_pipe->scl_data.viewport.height);

			data->src_width[num_displays * 2 + j] = bw_int_to_fixed(pipe[i].bottom_pipe->scl_data.viewport.width);

			data->pitch_in_pixels[num_displays * 2 + j] = bw_int_to_fixed(

					pipe[i].bottom_pipe->surface->public.plane_size.grph.surface_pitch);

					pipe[i].bottom_pipe->surface->plane_size.grph.surface_pitch);

			data->h_taps[num_displays * 2 + j] = bw_int_to_fixed(pipe[i].bottom_pipe->scl_data.taps.h_taps);

			data->v_taps[num_displays * 2 + j] = bw_int_to_fixed(pipe[i].bottom_pipe->scl_data.taps.v_taps);

			data->h_scale_ratio[num_displays * 2 + j] = fixed31_32_to_bw_fixed(

					pipe[i].bottom_pipe->scl_data.ratios.horz.value);

			data->v_scale_ratio[num_displays * 2 + j] = fixed31_32_to_bw_fixed(

					pipe[i].bottom_pipe->scl_data.ratios.vert.value);

			switch (pipe[i].bottom_pipe->surface->public.rotation) {

			switch (pipe[i].bottom_pipe->surface->rotation) {

			case ROTATION_ANGLE_0:

				data->rotation_angle[num_displays * 2 + j] = bw_int_to_fixed(0);

				break;
@@ -2718,7 +2718,7 @@ static void populate_initial_data( 
			data->v_taps[num_displays + 4] = bw_int_to_fixed(pipe[i].scl_data.taps.v_taps);

			data->h_scale_ratio[num_displays + 4] = fixed31_32_to_bw_fixed(pipe[i].scl_data.ratios.horz.value);

			data->v_scale_ratio[num_displays + 4] = fixed31_32_to_bw_fixed(pipe[i].scl_data.ratios.vert.value);

			switch (pipe[i].surface->public.rotation) {

			switch (pipe[i].surface->rotation) {

			case ROTATION_ANGLE_0:

				data->rotation_angle[num_displays + 4] = bw_int_to_fixed(0);

				break;
@@ -2734,7 +2734,7 @@ static void populate_initial_data( 
			default:

				break;

			}

			switch (pipe[i].surface->public.format) {

			switch (pipe[i].surface->format) {

			case SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr:

			case SURFACE_PIXEL_FORMAT_VIDEO_420_YCrCb:

			case SURFACE_PIXEL_FORMAT_GRPH_ARGB1555:

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

+13 −13
Original line number Diff line number Diff line
@@ -238,11 +238,11 @@ static void pipe_ctx_to_e2e_pipe_params ( 
	else if (pipe->bottom_pipe != NULL && pipe->bottom_pipe->surface == pipe->surface)

		input->src.is_hsplit = true;



	input->src.dcc                 = pipe->surface->public.dcc.enable;

	input->src.dcc                 = pipe->surface->dcc.enable;

	input->src.dcc_rate            = 1;

	input->src.meta_pitch          = pipe->surface->public.dcc.grph.meta_pitch;

	input->src.meta_pitch          = pipe->surface->dcc.grph.meta_pitch;

	input->src.source_scan         = dm_horz;

	input->src.sw_mode             = pipe->surface->public.tiling_info.gfx9.swizzle;

	input->src.sw_mode             = pipe->surface->tiling_info.gfx9.swizzle;



	input->src.viewport_width      = pipe->scl_data.viewport.width;

	input->src.viewport_height     = pipe->scl_data.viewport.height;
@@ -251,7 +251,7 @@ static void pipe_ctx_to_e2e_pipe_params ( 
	input->src.cur0_src_width      = 128; /* TODO: Cursor calcs, not curently stored */

	input->src.cur0_bpp            = 32;



	switch (pipe->surface->public.tiling_info.gfx9.swizzle) {

	switch (pipe->surface->tiling_info.gfx9.swizzle) {

	/* for 4/8/16 high tiles */

	case DC_SW_LINEAR:

		input->src.is_display_sw = 1;
@@ -299,7 +299,7 @@ static void pipe_ctx_to_e2e_pipe_params ( 
		break;

	}



	switch (pipe->surface->public.rotation) {

	switch (pipe->surface->rotation) {

	case ROTATION_ANGLE_0:

	case ROTATION_ANGLE_180:

		input->src.source_scan = dm_horz;
@@ -314,7 +314,7 @@ static void pipe_ctx_to_e2e_pipe_params ( 
	}



	/* TODO: Fix pixel format mappings */

	switch (pipe->surface->public.format) {

	switch (pipe->surface->format) {

	case SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr:

	case SURFACE_PIXEL_FORMAT_VIDEO_420_YCrCb:

		input->src.source_format = dm_420_8;
@@ -455,7 +455,7 @@ static void dcn_bw_calc_rq_dlg_ttu( 
			true,

			true,

			v->pte_enable == dcn_bw_yes,

			pipe->surface->public.flip_immediate);

			pipe->surface->flip_immediate);

}



static void dcn_dml_wm_override(
@@ -527,7 +527,7 @@ static void dcn_dml_wm_override( 
			true,

			true,

			v->pte_enable == dcn_bw_yes,

			pipe->surface->public.flip_immediate);

			pipe->surface->flip_immediate);

		in_idx++;

	}

	dm_free(input);
@@ -883,7 +883,7 @@ bool dcn_validate_bandwidth( 
			v->scaler_rec_out_width[input_idx] = pipe->scl_data.recout.width;

			v->scaler_recout_height[input_idx] = pipe->scl_data.recout.height;

			if (pipe->bottom_pipe && pipe->bottom_pipe->surface == pipe->surface) {

				if (pipe->surface->public.rotation % 2 == 0) {

				if (pipe->surface->rotation % 2 == 0) {

					int viewport_end = pipe->scl_data.viewport.width

							+ pipe->scl_data.viewport.x;

					int viewport_b_end = pipe->bottom_pipe->scl_data.viewport.width
@@ -912,17 +912,17 @@ bool dcn_validate_bandwidth( 
						+ pipe->bottom_pipe->scl_data.recout.width;

			}



			v->dcc_enable[input_idx] = pipe->surface->public.dcc.enable ? dcn_bw_yes : dcn_bw_no;

			v->dcc_enable[input_idx] = pipe->surface->dcc.enable ? dcn_bw_yes : dcn_bw_no;

			v->source_pixel_format[input_idx] = tl_pixel_format_to_bw_defs(

					pipe->surface->public.format);

					pipe->surface->format);

			v->source_surface_mode[input_idx] = tl_sw_mode_to_bw_defs(

					pipe->surface->public.tiling_info.gfx9.swizzle);

					pipe->surface->tiling_info.gfx9.swizzle);

			v->lb_bit_per_pixel[input_idx] = tl_lb_bpp_to_int(pipe->scl_data.lb_params.depth);

			v->override_hta_ps[input_idx] = pipe->scl_data.taps.h_taps;

			v->override_vta_ps[input_idx] = pipe->scl_data.taps.v_taps;

			v->override_hta_pschroma[input_idx] = pipe->scl_data.taps.h_taps_c;

			v->override_vta_pschroma[input_idx] = pipe->scl_data.taps.v_taps_c;

			v->source_scan[input_idx] = (pipe->surface->public.rotation % 2) ? dcn_bw_vert : dcn_bw_hor;

			v->source_scan[input_idx] = (pipe->surface->rotation % 2) ? dcn_bw_vert : dcn_bw_hor;

		}

		if (v->is_line_buffer_bpp_fixed == dcn_bw_yes)

			v->lb_bit_per_pixel[input_idx] = v->line_buffer_fixed_bpp;

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

+35 −38
Original line number Diff line number Diff line
@@ -946,8 +946,8 @@ static bool dc_commit_context_no_check(struct dc *dc, struct validate_context *c 
		const struct core_sink *sink = context->streams[i]->sink;



		for (j = 0; j < context->stream_status[i].surface_count; j++) {

			struct core_surface *surface =

					DC_SURFACE_TO_CORE(context->stream_status[i].surfaces[j]);

			const struct dc_surface *surface =

					context->stream_status[i].surfaces[j];



			core_dc->hwss.apply_ctx_for_surface(core_dc, surface, context);
@@ -1098,7 +1098,7 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc) 


bool dc_commit_surfaces_to_stream(

		struct dc *dc,

		const struct dc_surface **new_surfaces,

		struct dc_surface **new_surfaces,

		uint8_t new_surface_count,

		const struct dc_stream *dc_stream)

{
@@ -1189,7 +1189,7 @@ static bool is_surface_in_context( 
	for (j = 0; j < MAX_PIPES; j++) {

		const struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];



		if (surface == &pipe_ctx->surface->public) {

		if (surface == pipe_ctx->surface) {

			return true;

		}

	}
@@ -1422,7 +1422,7 @@ void dc_update_surfaces_and_stream(struct dc *dc, 
		update_surface_trace(dc, srf_updates, surface_count);



	if (update_type >= UPDATE_TYPE_FULL) {

		const struct dc_surface *new_surfaces[MAX_SURFACES] = {0};

		struct dc_surface *new_surfaces[MAX_SURFACES] = {0};



		for (i = 0; i < surface_count; i++)

			new_surfaces[i] = srf_updates[i].surface;
@@ -1448,46 +1448,45 @@ void dc_update_surfaces_and_stream(struct dc *dc, 


	/* save update parameters into surface */

	for (i = 0; i < surface_count; i++) {

		struct core_surface *surface =

				DC_SURFACE_TO_CORE(srf_updates[i].surface);

		struct dc_surface *surface = srf_updates[i].surface;



		if (srf_updates[i].flip_addr) {

			surface->public.address = srf_updates[i].flip_addr->address;

			surface->public.flip_immediate =

			surface->address = srf_updates[i].flip_addr->address;

			surface->flip_immediate =

					srf_updates[i].flip_addr->flip_immediate;

		}



		if (srf_updates[i].scaling_info) {

			surface->public.scaling_quality =

			surface->scaling_quality =

					srf_updates[i].scaling_info->scaling_quality;

			surface->public.dst_rect =

			surface->dst_rect =

					srf_updates[i].scaling_info->dst_rect;

			surface->public.src_rect =

			surface->src_rect =

					srf_updates[i].scaling_info->src_rect;

			surface->public.clip_rect =

			surface->clip_rect =

					srf_updates[i].scaling_info->clip_rect;

		}



		if (srf_updates[i].plane_info) {

			surface->public.color_space =

			surface->color_space =

					srf_updates[i].plane_info->color_space;

			surface->public.format =

			surface->format =

					srf_updates[i].plane_info->format;

			surface->public.plane_size =

			surface->plane_size =

					srf_updates[i].plane_info->plane_size;

			surface->public.rotation =

			surface->rotation =

					srf_updates[i].plane_info->rotation;

			surface->public.horizontal_mirror =

			surface->horizontal_mirror =

					srf_updates[i].plane_info->horizontal_mirror;

			surface->public.stereo_format =

			surface->stereo_format =

					srf_updates[i].plane_info->stereo_format;

			surface->public.tiling_info =

			surface->tiling_info =

					srf_updates[i].plane_info->tiling_info;

			surface->public.visible =

			surface->visible =

					srf_updates[i].plane_info->visible;

			surface->public.per_pixel_alpha =

			surface->per_pixel_alpha =

					srf_updates[i].plane_info->per_pixel_alpha;

			surface->public.dcc =

			surface->dcc =

					srf_updates[i].plane_info->dcc;

		}
@@ -1503,31 +1502,31 @@ void dc_update_surfaces_and_stream(struct dc *dc, 
		}



		if (srf_updates[i].gamma &&

			srf_updates[i].gamma != surface->public.gamma_correction) {

			if (surface->public.gamma_correction != NULL)

				dc_gamma_release(&surface->public.

			srf_updates[i].gamma != surface->gamma_correction) {

			if (surface->gamma_correction != NULL)

				dc_gamma_release(&surface->

						gamma_correction);



			dc_gamma_retain(srf_updates[i].gamma);

			surface->public.gamma_correction =

			surface->gamma_correction =

						srf_updates[i].gamma;

		}



		if (srf_updates[i].in_transfer_func &&

			srf_updates[i].in_transfer_func != surface->public.in_transfer_func) {

			if (surface->public.in_transfer_func != NULL)

			srf_updates[i].in_transfer_func != surface->in_transfer_func) {

			if (surface->in_transfer_func != NULL)

				dc_transfer_func_release(

						surface->public.

						surface->

						in_transfer_func);



			dc_transfer_func_retain(

					srf_updates[i].in_transfer_func);

			surface->public.in_transfer_func =

			surface->in_transfer_func =

					srf_updates[i].in_transfer_func;

		}



		if (srf_updates[i].hdr_static_metadata)

			surface->public.hdr_static_ctx =

			surface->hdr_static_ctx =

				*(srf_updates[i].hdr_static_metadata);

	}
@@ -1543,12 +1542,10 @@ void dc_update_surfaces_and_stream(struct dc *dc, 


	if (update_type > UPDATE_TYPE_FAST) {

		for (i = 0; i < surface_count; i++) {

			struct core_surface *surface = DC_SURFACE_TO_CORE(srf_updates[i].surface);



			for (j = 0; j < core_dc->res_pool->pipe_count; j++) {

				struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];



				if (pipe_ctx->surface != surface)

				if (pipe_ctx->surface != srf_updates[i].surface)

					continue;



				core_dc->hwss.wait_for_mpcc_disconnect(core_dc->res_pool, pipe_ctx);
@@ -1561,7 +1558,7 @@ void dc_update_surfaces_and_stream(struct dc *dc, 


	/* Lock pipes for provided surfaces, or all active if full update*/

	for (i = 0; i < surface_count; i++) {

		struct core_surface *surface = DC_SURFACE_TO_CORE(srf_updates[i].surface);

		struct dc_surface *surface = srf_updates[i].surface;



		for (j = 0; j < core_dc->res_pool->pipe_count; j++) {

			struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
@@ -1613,7 +1610,7 @@ void dc_update_surfaces_and_stream(struct dc *dc, 


	/* Perform requested Updates */

	for (i = 0; i < surface_count; i++) {

		struct core_surface *surface = DC_SURFACE_TO_CORE(srf_updates[i].surface);

		struct dc_surface *surface = srf_updates[i].surface;



		if (update_type == UPDATE_TYPE_MED)

			core_dc->hwss.apply_ctx_for_surface(
@@ -1654,7 +1651,7 @@ void dc_update_surfaces_and_stream(struct dc *dc, 


		for (j = 0; j < surface_count; j++) {

			if (update_type != UPDATE_TYPE_FULL &&

					srf_updates[j].surface != &pipe_ctx->surface->public)

			    srf_updates[j].surface != pipe_ctx->surface)

				continue;

			if (!pipe_ctx->surface || pipe_ctx->top_pipe)

				continue;

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

+21 −21
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void rect_swap_helper(struct rect *rect) 


static void calculate_viewport(struct pipe_ctx *pipe_ctx)

{

	const struct dc_surface *surface = &pipe_ctx->surface->public;

	const struct dc_surface *surface = pipe_ctx->surface;

	const struct dc_stream *stream = &pipe_ctx->stream->public;

	struct scaler_data *data = &pipe_ctx->scl_data;

	struct rect surf_src = surface->src_rect;
@@ -446,8 +446,8 @@ static void calculate_viewport(struct pipe_ctx *pipe_ctx) 
		sec_split = false;

	}



	if (pipe_ctx->surface->public.rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->public.rotation == ROTATION_ANGLE_270)

	if (pipe_ctx->surface->rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->rotation == ROTATION_ANGLE_270)

		rect_swap_helper(&surf_src);



	/* The actual clip is an intersection between stream
@@ -527,14 +527,14 @@ static void calculate_viewport(struct pipe_ctx *pipe_ctx) 


static void calculate_recout(struct pipe_ctx *pipe_ctx, struct view *recout_skip)

{

	const struct dc_surface *surface = &pipe_ctx->surface->public;

	const struct dc_surface *surface = pipe_ctx->surface;

	struct core_stream *stream = pipe_ctx->stream;

	struct rect surf_src = surface->src_rect;

	struct rect surf_clip = surface->clip_rect;

	int recout_full_x, recout_full_y;



	if (pipe_ctx->surface->public.rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->public.rotation == ROTATION_ANGLE_270)

	if (pipe_ctx->surface->rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->rotation == ROTATION_ANGLE_270)

		rect_swap_helper(&surf_src);



	pipe_ctx->scl_data.recout.x = stream->public.dst.x;
@@ -605,7 +605,7 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx, struct view *recout_skip 


static void calculate_scaling_ratios(struct pipe_ctx *pipe_ctx)

{

	const struct dc_surface *surface = &pipe_ctx->surface->public;

	const struct dc_surface *surface = pipe_ctx->surface;

	struct core_stream *stream = pipe_ctx->stream;

	struct rect surf_src = surface->src_rect;

	const int in_w = stream->public.src.width;
@@ -613,8 +613,8 @@ static void calculate_scaling_ratios(struct pipe_ctx *pipe_ctx) 
	const int out_w = stream->public.dst.width;

	const int out_h = stream->public.dst.height;



	if (pipe_ctx->surface->public.rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->public.rotation == ROTATION_ANGLE_270)

	if (pipe_ctx->surface->rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->rotation == ROTATION_ANGLE_270)

		rect_swap_helper(&surf_src);



	pipe_ctx->scl_data.ratios.horz = dal_fixed31_32_from_fraction(
@@ -647,13 +647,13 @@ static void calculate_scaling_ratios(struct pipe_ctx *pipe_ctx) 
static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *recout_skip)

{

	struct scaler_data *data = &pipe_ctx->scl_data;

	struct rect src = pipe_ctx->surface->public.src_rect;

	struct rect src = pipe_ctx->surface->src_rect;

	int vpc_div = (data->format == PIXEL_FORMAT_420BPP8

			|| data->format == PIXEL_FORMAT_420BPP10) ? 2 : 1;





	if (pipe_ctx->surface->public.rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->public.rotation == ROTATION_ANGLE_270) {

	if (pipe_ctx->surface->rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->rotation == ROTATION_ANGLE_270) {

		rect_swap_helper(&src);

		rect_swap_helper(&data->viewport_c);

		rect_swap_helper(&data->viewport);
@@ -803,8 +803,8 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *r 
	data->inits.v_bot = dal_fixed31_32_add(data->inits.v, data->ratios.vert);

	data->inits.v_c_bot = dal_fixed31_32_add(data->inits.v_c, data->ratios.vert_c);



	if (pipe_ctx->surface->public.rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->public.rotation == ROTATION_ANGLE_270) {

	if (pipe_ctx->surface->rotation == ROTATION_ANGLE_90 ||

			pipe_ctx->surface->rotation == ROTATION_ANGLE_270) {

		rect_swap_helper(&data->viewport_c);

		rect_swap_helper(&data->viewport);

	}
@@ -812,7 +812,7 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *r 


bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)

{

	const struct dc_surface *surface = &pipe_ctx->surface->public;

	const struct dc_surface *surface = pipe_ctx->surface;

	struct dc_crtc_timing *timing = &pipe_ctx->stream->public.timing;

	struct view recout_skip = { 0 };

	bool res = false;
@@ -822,7 +822,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) 
	 * Inits require viewport, taps, ratios and recout of split pipe

	 */

	pipe_ctx->scl_data.format = convert_pixel_format_to_dalsurface(

			pipe_ctx->surface->public.format);

			pipe_ctx->surface->format);



	calculate_scaling_ratios(pipe_ctx);
@@ -1029,7 +1029,7 @@ static int acquire_first_split_pipe( 
#endif



bool resource_attach_surfaces_to_context(

		const struct dc_surface * const *surfaces,

		struct dc_surface * const *surfaces,

		int surface_count,

		const struct dc_stream *dc_stream,

		struct validate_context *context,
@@ -1077,7 +1077,7 @@ bool resource_attach_surfaces_to_context( 


	tail_pipe = NULL;

	for (i = 0; i < surface_count; i++) {

		struct core_surface *surface = DC_SURFACE_TO_CORE(surfaces[i]);

		struct dc_surface *surface = surfaces[i];

		struct pipe_ctx *free_pipe = acquire_free_pipe_for_stream(

				context, pool, dc_stream);
@@ -1358,7 +1358,7 @@ bool resource_is_stream_unchanged( 
static void copy_pipe_ctx(

	const struct pipe_ctx *from_pipe_ctx, struct pipe_ctx *to_pipe_ctx)

{

	struct core_surface *surface = to_pipe_ctx->surface;

	struct dc_surface *surface = to_pipe_ctx->surface;

	struct core_stream *stream = to_pipe_ctx->stream;



	*to_pipe_ctx = *from_pipe_ctx;
@@ -2072,7 +2072,7 @@ static void set_spd_info_packet( 


static void set_hdr_static_info_packet(

		struct encoder_info_packet *info_packet,

		struct core_surface *surface,

		struct dc_surface *surface,

		struct core_stream *stream)

{

	uint16_t i = 0;
@@ -2083,7 +2083,7 @@ static void set_hdr_static_info_packet( 
	if (!surface)

		return;



	hdr_metadata = surface->public.hdr_static_ctx;

	hdr_metadata = surface->hdr_static_ctx;



	if (!hdr_metadata.hdr_supported)

		return;