Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5724ba1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 7cbea6b0 5a9807e1

drivers/media/platform/msm/vidc/msm_vidc_dcvs.c

+4 −4
Original line number Diff line number Diff line
@@ -599,8 +599,8 @@ static bool msm_dcvs_check_supported(struct msm_vidc_inst *inst) 
			goto dcvs_decision_done;

		}

		if (msm_comm_turbo_session(inst) ||

			!IS_VALID_DCVS_SESSION(instance_load, dcvs_limit ||

			instance_count > 1))

			!IS_VALID_DCVS_SESSION(instance_load, dcvs_limit) ||

			instance_count > 1)

			is_dcvs_supported = false;

	}

	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;

		}

		if (msm_comm_turbo_session(inst) ||

			!IS_VALID_DCVS_SESSION(instance_load, dcvs_limit ||

				instance_count > 1))

			!IS_VALID_DCVS_SESSION(instance_load, dcvs_limit) ||

				instance_count > 1)

			is_dcvs_supported = false;

	}

dcvs_decision_done: