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

Commit deab78d6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Set the scaler flag in pipe after copying scaler data"

parents 569e8ec8 561fed2b

drivers/video/msm/mdss/mdss_mdp_layer.c

+6 −4
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ static int __configure_pipe_params(struct msm_fb_data_type *mfd, 
	if (layer->flags & MDP_LAYER_PP)

		pipe->flags |= MDP_OVERLAY_PP_CFG_EN;



	pipe->scaler.enable = (layer->flags & SCALER_ENABLED);

	pipe->is_fg = layer->flags & MDP_LAYER_FORGROUND;

	pipe->img_width = layer->buffer.width & 0x3fff;

	pipe->img_height = layer->buffer.height & 0x3fff;
@@ -541,6 +540,12 @@ static int __configure_pipe_params(struct msm_fb_data_type *mfd, 
		pipe->src.x, pipe->src.y, pipe->src.w, pipe->src.h,

		pipe->dst.x, pipe->dst.y, pipe->dst.w, pipe->dst.h);



	if (layer->flags & SCALER_ENABLED)

		memcpy(&pipe->scaler, layer->scale,

			sizeof(struct mdp_scale_data_v2));



	pipe->scaler.enable = (layer->flags & SCALER_ENABLED);



	flags = pipe->flags;

	if (is_single_layer)

		flags |= PERF_CALC_PIPE_SINGLE_LAYER;
@@ -661,9 +666,6 @@ static int __configure_pipe_params(struct msm_fb_data_type *mfd, 
		}

	}



	if (layer->flags & SCALER_ENABLED)

		memcpy(&pipe->scaler, layer->scale,

			sizeof(struct mdp_scale_data_v2));

	ret = mdss_mdp_overlay_setup_scaling(pipe);

	if (ret) {

		pr_err("scaling setup failed %d\n", ret);