diff options
| author | Krishna Chaitanya Parimi <cparimi@codeaurora.org> | 2015-11-08 13:31:45 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:47:43 -0700 |
| commit | 5603c85bef58d8574c2313b7014fd758fd372c09 (patch) | |
| tree | e1107ae82e21e0552a88fe0319e18ce40220af8d | |
| parent | e3330fb73673e62aaaa22db189a57f7eb3e09a45 (diff) | |
msm: mdss: program gamut registers only if offset present
Gamut may not be present in all targets. The device tree
offset for gamut can indicate presence of block on target.
Program gamut if gamut offset is present in mdss device
tree. Also allow parsing of further PP block offsets in
device tree even when gamut entry is absent.
Change-Id: I87d057190dcfdb3cb57d88ea3b6d68f02deac5fa
Signed-off-by: Krishna Chaitanya Parimi <cparimi@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c index 1e459aaffdb4..5466f68bf7e3 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pp.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c @@ -1858,7 +1858,8 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer) } mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON); - if (pp_driver_ops.gamut_clk_gate_en) + if ((mdata->pp_block_off.dspp_gamut_off != U32_MAX) && + (pp_driver_ops.gamut_clk_gate_en)) pp_driver_ops.gamut_clk_gate_en(base + mdata->pp_block_off.dspp_gamut_off); ret = pp_hist_setup(&opmode, MDSS_PP_DSPP_CFG | dspp_num, mixer); @@ -2361,9 +2362,9 @@ static int mdss_mdp_pp_dt_parse(struct device *dev) "qcom,mdss-dspp-gamut-off", &prop_val); if (ret) { - pr_err("read property %s failed ret %d\n", + pr_debug("Could not read/find %s prop ret %d\n", "qcom,mdss-dspp-gamut-off", ret); - goto bail_out; + mdata->pp_block_off.dspp_gamut_off = U32_MAX; } else { mdata->pp_block_off.dspp_gamut_off = prop_val; } |