summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorBenet Clark <benetc@codeaurora.org>2015-01-15 19:49:12 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:38:17 -0700
commit19ac09fff8b7fff101d82eb8a8cb06e3c3cfdf33 (patch)
treee08e8b1e0059e5a96ff2f8e12e819641e4a084af /drivers/video/fbdev
parentaa5020f2af6789b99cb5ec4cd6035dd6204178cd (diff)
msm: mdss: Prevent QSEED scaling on VIG pipe with RGB data
When the VIG source side pipes are reconfigured from YUV to RGB data, the sharpening/smoothing QSEED block is sometimes still enabled, but it is only allowed for YUV data. This change adds a specific check if the source format is YUV before proceeding with sharpening/smoothing enable. Change-Id: I5ba39f6910bb41eaed898726c9c1419699371784 Signed-off-by: Benet Clark <benetc@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 3cbcef6e85c3..e12b9d96718a 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -1021,7 +1021,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))) {
@@ -1077,7 +1078,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))) {