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

Commit c31e7961 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: Prevent QSEED scaling on VIG pipe with RGB data"

parents 87fb1e5a 9fdc27ed

drivers/video/msm/mdss/mdss_mdp_pp.c

+5 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1098,7 +1098,8 @@ static int mdss_mdp_scale_setup(struct mdss_mdp_pipe *pipe) 
	}



	if ((src_h != pipe->dst.h) ||

	    (pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE) ||

	    (pipe->src_fmt->is_yuv &&

			(pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE)) ||

	    (chroma_sample == MDSS_MDP_CHROMA_420) ||

	    (chroma_sample == MDSS_MDP_CHROMA_H1V2) ||

	    (pipe->scale.enable_pxl_ext && (src_h != pipe->dst.h))) {
@@ -1154,7 +1155,8 @@ static int mdss_mdp_scale_setup(struct mdss_mdp_pipe *pipe) 
	}



	if ((src_w != pipe->dst.w) ||

	    (pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE) ||

	    (pipe->src_fmt->is_yuv &&

			(pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE)) ||

	    (chroma_sample == MDSS_MDP_CHROMA_420) ||

	    (chroma_sample == MDSS_MDP_CHROMA_H2V1) ||

	    (pipe->scale.enable_pxl_ext && (src_w != pipe->dst.w))) {