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

Commit aad9325c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c7eadc26 on remote branch 

Change-Id: I89753de3bfed4d0cbb2ce74bd6881250c2ee3277
parents f0cc688e c7eadc26

msm/vidc/msm_venc.c

+2 −2
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ int msm_venc_set_frame_qp(struct msm_vidc_inst *inst) 
	 *   Enable QP types which have been set by client.

	 * When RC is OFF:

	 *   I_QP value must be set by client.

	 *   If other QP value is invalid, then, assign I_QP value to it.

	 *   If QP value is invalid, then, assign default QP.

	 */

	if (inst->rc_type != RATE_CONTROL_OFF) {

		if (!(inst->client_set_ctrls & CLIENT_SET_I_QP))
@@ -2900,7 +2900,7 @@ int msm_venc_set_frame_qp(struct msm_vidc_inst *inst) 
		if (!(inst->client_set_ctrls & CLIENT_SET_I_QP)) {

			s_vpr_e(inst->sid,

				"%s: Client value is not valid\n", __func__);

			return -EINVAL;

			i_qp->val = DEFAULT_QP;

		}

		if (!(inst->client_set_ctrls & CLIENT_SET_P_QP))

			p_qp->val = i_qp->val;

msm/vidc/msm_vidc_common.c

+3 −3
Original line number Diff line number Diff line
@@ -5818,7 +5818,7 @@ static int msm_vidc_check_mbpf_supported(struct msm_vidc_inst *inst) 


	if (mbpf > core->resources.max_mbpf) {

		msm_vidc_print_running_insts(inst->core);

		return -EBUSY;

		return -ENOMEM;

	}



	return 0;
@@ -5915,7 +5915,7 @@ int msm_comm_check_memory_supported(struct msm_vidc_inst *vidc_inst) 
			"%s: video mem overshoot - reached %llu MB, max_limit %llu MB\n",

			__func__, total_mem_size >> 20, memory_limit_mbytes);

		msm_comm_print_insts_info(core);

		return -EBUSY;

		return -ENOMEM;

	}



	if (!is_secure_session(vidc_inst)) {
@@ -5930,7 +5930,7 @@ int msm_comm_check_memory_supported(struct msm_vidc_inst *vidc_inst) 
				"%s: insufficient device addr space, required %llu, available %llu\n",

				__func__, non_sec_mem_size, non_sec_cb_size);

			msm_comm_print_insts_info(core);

			return -EINVAL;

			return -ENOMEM;

		}

	}