diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-31 04:42:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-31 04:42:30 -0800 |
| commit | b2179ceb0e208e929c50f1e61034f44bd84a1691 (patch) | |
| tree | a8042d350f3bf85d24d2919729d631ec708c9c42 /drivers/media | |
| parent | c00bc44b4bc16cde48bd0195a723c405117fbeef (diff) | |
| parent | 726f72cbe707f46fb49a830c089d8c1cfdb5155a (diff) | |
Merge "msm_vidc: Disable DCVS in thumbnail mode"
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc_dcvs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c b/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c index 3cd1c38f8f37..65f70d901f2a 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2017, 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 @@ -570,7 +570,8 @@ static bool msm_dcvs_check_supported(struct msm_vidc_inst *inst) inst->dcvs.extra_buffer_count = 0; if (!IS_VALID_DCVS_SESSION(num_mbs_per_frame, - res->dcvs_limit[inst->session_type].min_mbpf)) { + res->dcvs_limit[inst->session_type].min_mbpf) || + (inst->flags & VIDC_THUMBNAIL)) { inst->dcvs.extra_buffer_count = 0; is_dcvs_supported = false; goto dcvs_decision_done; |