diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-22 23:41:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-22 23:41:06 -0700 |
| commit | 93202f2f62a2cbfd5aa1fbcd738e83acaa996212 (patch) | |
| tree | 6ad9f3bb92cc280c97ec1d88d08cefe795ff762b | |
| parent | cb75f7e5b73e554164dbe11a362ca849c402ec46 (diff) | |
| parent | 2e84662f2c372b2724773332c9212470d1fa5471 (diff) | |
Merge "msm: vidc: Scale clocks with inst load during dcvs setup period"
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc_dcvs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c b/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c index 3e269576c126..9bc313adb10a 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c @@ -407,8 +407,10 @@ static int msm_dcvs_enc_scale_clocks(struct msm_vidc_inst *inst) if (dcvs->etb_counter < total_input_buf) { dcvs->etb_counter++; - if (dcvs->etb_counter != total_input_buf) - return rc; + if (dcvs->etb_counter != total_input_buf) { + return msm_comm_scale_clocks_load(core, dcvs->load, + LOAD_CALC_NO_QUIRKS); + } } dprintk(VIDC_PROF, @@ -425,7 +427,7 @@ static int msm_dcvs_enc_scale_clocks(struct msm_vidc_inst *inst) } if (fw_pending_bufs >= DCVS_ENC_HIGH_THR && - dcvs->load <= dcvs->load_low) { + dcvs->load < dcvs->load_high) { dcvs->load = dcvs->load_high; dcvs->prev_freq_increased = true; } else { |