Merge "msm: vidc: Remove init_completion before wait" (0420b017) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/vidc_3x/msm_vidc_common.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -2474,7 +2474,6 @@ static int msm_comm_session_abort(struct msm_vidc_inst *inst)
		}
		hdev = inst->core->device;
		abort_completion = SESSION_MSG_INDEX(HAL_SESSION_ABORT_DONE);
		init_completion(&inst->completions[abort_completion]);

		rc = call_hfi_op(hdev, session_abort, (void *)inst->session);
		if (rc) {
		@@ -2632,8 +2631,6 @@ static int msm_comm_init_core(struct msm_vidc_inst *inst)
		__func__);
		}

		init_completion(&core->completions
		[SYS_MSG_INDEX(HAL_SYS_INIT_DONE)]);
		rc = call_hfi_op(hdev, core_init, hdev->hfi_device_data);
		if (rc) {
		dprintk(VIDC_ERR, "Failed to init core, id = %d\n",
		@@ -2737,8 +2734,6 @@ static int msm_comm_session_init(int flipped_state,
		dprintk(VIDC_ERR, "Invalid session\n");
		return -EINVAL;
		}
		init_completion(
		&inst->completions[SESSION_MSG_INDEX(HAL_SESSION_INIT_DONE)]);

		rc = call_hfi_op(hdev, session_init, hdev->hfi_device_data,
		inst, get_hal_domain(inst->session_type),
		@@ -2877,8 +2872,6 @@ static int msm_vidc_start(int flipped_state, struct msm_vidc_inst *inst)
		inst, inst->state);
		goto exit;
		}
		init_completion(
		&inst->completions[SESSION_MSG_INDEX(HAL_SESSION_START_DONE)]);
		rc = call_hfi_op(hdev, session_start, (void *) inst->session);
		if (rc) {
		dprintk(VIDC_ERR,
		@@ -2908,8 +2901,6 @@ static int msm_vidc_stop(int flipped_state, struct msm_vidc_inst *inst)
		goto exit;
		}
		dprintk(VIDC_DBG, "Send Stop to hal\n");
		init_completion(
		&inst->completions[SESSION_MSG_INDEX(HAL_SESSION_STOP_DONE)]);
		rc = call_hfi_op(hdev, session_stop, (void *) inst->session);
		if (rc) {
		dprintk(VIDC_ERR, "Failed to send stop\n");
		@@ -2939,8 +2930,6 @@ static int msm_vidc_release_res(int flipped_state, struct msm_vidc_inst *inst)
		}
		dprintk(VIDC_DBG,
		"Send release res to hal\n");
		init_completion(&inst->completions[
		SESSION_MSG_INDEX(HAL_SESSION_RELEASE_RESOURCE_DONE)]);
		rc = call_hfi_op(hdev, session_release_res, (void *) inst->session);
		if (rc) {
		dprintk(VIDC_ERR,
		@@ -2971,8 +2960,6 @@ static int msm_comm_session_close(int flipped_state,
		}
		dprintk(VIDC_DBG,
		"Send session close to hal\n");
		init_completion(
		&inst->completions[SESSION_MSG_INDEX(HAL_SESSION_END_DONE)]);
		rc = call_hfi_op(hdev, session_end, (void *) inst->session);
		if (rc) {
		dprintk(VIDC_ERR,
		@@ -4021,8 +4008,6 @@ int msm_comm_try_get_prop(struct msm_vidc_inst *inst, enum hal_property ptype,
		}
		mutex_unlock(&inst->sync_lock);

		init_completion(&inst->completions[
		SESSION_MSG_INDEX(HAL_SESSION_PROPERTY_INFO)]);
		switch (ptype) {
		case HAL_PARAM_PROFILE_LEVEL_CURRENT:
		case HAL_CONFIG_VDEC_ENTROPY:
		@@ -4248,8 +4233,6 @@ int msm_comm_release_scratch_buffers(struct msm_vidc_inst *inst,
		if (inst->state != MSM_VIDC_CORE_INVALID &&
		core->state != VIDC_CORE_INVALID) {
		buffer_info.response_required = true;
		init_completion(&inst->completions[SESSION_MSG_INDEX
		(HAL_SESSION_RELEASE_BUFFER_DONE)]);
		rc = call_hfi_op(hdev, session_release_buffers,
		(void *)inst->session, &buffer_info);
		if (rc) {
		@@ -4321,9 +4304,6 @@ int msm_comm_release_persist_buffers(struct msm_vidc_inst *inst)
		if (inst->state != MSM_VIDC_CORE_INVALID &&
		core->state != VIDC_CORE_INVALID) {
		buffer_info.response_required = true;
		init_completion(
		&inst->completions[SESSION_MSG_INDEX
		(HAL_SESSION_RELEASE_BUFFER_DONE)]);
		rc = call_hfi_op(hdev, session_release_buffers,
		(void *)inst->session, &buffer_info);
		if (rc) {