Merge "msm-vidc: don't update capabilities for CVP session" (b2ff4df9) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/msm_vidc_common.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -1491,13 +1491,6 @@ static void handle_session_init_done(enum hal_command_response cmd, void *data)
		goto error;
		}

		if (inst->session_type == MSM_VIDC_CVP) {
		s_vpr_h(inst->sid, "%s: cvp session\n", __func__);
		signal_session_msg_receipt(cmd, inst);
		put_inst(inst);
		return;
		}

		s_vpr_l(inst->sid, "handled: SESSION_INIT_DONE\n");
		signal_session_msg_receipt(cmd, inst);
		put_inst(inst);
		@@ -1524,6 +1517,11 @@ static int msm_comm_update_capabilities(struct msm_vidc_inst *inst)
		return -EINVAL;
		}

		if (inst->session_type == MSM_VIDC_CVP) {
		s_vpr_h(inst->sid, "%s: cvp session\n", __func__);
		return 0;
		}

		core = inst->core;
		codec = get_v4l2_codec(inst);