evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: vidc: Fix the condition to check dcvs support"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-11 22:33:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit f5724ba17b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/platform/msm/vidc/msm_vidc_dcvs.c
View file

@ -599,8 +599,8 @@ static bool msm_dcvs_check_supported(struct msm_vidc_inst *inst)
goto dcvs_decision_done; goto dcvs_decision_done;
} }
if (msm_comm_turbo_session(inst) || if (msm_comm_turbo_session(inst) ||
!IS_VALID_DCVS_SESSION(instance_load, dcvs_limit || !IS_VALID_DCVS_SESSION(instance_load, dcvs_limit) ||
instance_count > 1)) instance_count > 1)
is_dcvs_supported = false; is_dcvs_supported = false;
} }
if (inst->session_type == MSM_VIDC_ENCODER) { if (inst->session_type == MSM_VIDC_ENCODER) {
@ -617,8 +617,8 @@ static bool msm_dcvs_check_supported(struct msm_vidc_inst *inst)
goto dcvs_decision_done; goto dcvs_decision_done;
} }
if (msm_comm_turbo_session(inst) || if (msm_comm_turbo_session(inst) ||
!IS_VALID_DCVS_SESSION(instance_load, dcvs_limit || !IS_VALID_DCVS_SESSION(instance_load, dcvs_limit) ||
instance_count > 1)) instance_count > 1)
is_dcvs_supported = false; is_dcvs_supported = false;
} }
dcvs_decision_done: dcvs_decision_done: