Merge "msm: vidc: Suppress spammy log" (d30e3d28) · Commits · e / devices / android_kernel_sony_msm8994

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -686,7 +686,8 @@ int output_buffer_cache_invalidate(struct msm_vidc_inst *inst,
		return -EINVAL;
		}
		} else
		dprintk(VIDC_ERR, "%s: WARN: NULL handle", __func__);
		dprintk(VIDC_DBG, "%s: NULL handle for plane %d\n",
		__func__, i);
		}
		return 0;
		}

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -395,7 +395,8 @@ static int wait_for_sess_signal_receipt(struct msm_vidc_inst *inst,
		&inst->completions[SESSION_MSG_INDEX(cmd)],
		msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
		if (!rc) {
		dprintk(VIDC_ERR, "Wait interrupted or timeout: %d\n", rc);
		dprintk(VIDC_ERR, "Wait interrupted or timeout: %d\n",
		SESSION_MSG_INDEX(cmd));
		msm_comm_recover_from_session_error(inst);
		rc = -EIO;
		} else {
		@@ -1475,7 +1476,8 @@ static int msm_comm_unset_ocmem(struct msm_vidc_core *core)
		&core->completions[SYS_MSG_INDEX(RELEASE_RESOURCE_DONE)],
		msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
		if (!rc) {
		dprintk(VIDC_ERR, "Wait interrupted or timeout: %d\n", rc);
		dprintk(VIDC_ERR, "Wait interrupted or timeout: %d\n",
		SYS_MSG_INDEX(RELEASE_RESOURCE_DONE));
		rc = -EIO;
		}
		release_ocmem_failed:
		@@ -1497,7 +1499,8 @@ static int msm_comm_init_core_done(struct msm_vidc_inst *inst)
		&core->completions[SYS_MSG_INDEX(SYS_INIT_DONE)],
		msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
		if (!rc) {
		dprintk(VIDC_ERR, "Wait interrupted or timeout: %d\n", rc);
		dprintk(VIDC_ERR, "Wait interrupted or timeout: %d\n",
		SYS_MSG_INDEX(SYS_INIT_DONE));
		rc = -EIO;
		goto exit;
		} else {
		@@ -2655,7 +2658,8 @@ int msm_comm_try_get_prop(struct msm_vidc_inst *inst, enum hal_property ptype,
		msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
		if (!rc) {
		dprintk(VIDC_ERR,
		"Wait interrupted or timeout: %d\n", rc);
		"Wait interrupted or timeout: %d\n",
		SESSION_MSG_INDEX(SESSION_PROPERTY_INFO));
		inst->state = MSM_VIDC_CORE_INVALID;
		msm_comm_recover_from_session_error(inst);
		rc = -EIO;
		@@ -3497,7 +3501,7 @@ int msm_comm_recover_from_session_error(struct msm_vidc_inst *inst)
		msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
		if (!rc) {
		dprintk(VIDC_ERR, "%s: Wait interrupted or timeout: %d\n",
		__func__, rc);
		__func__, SESSION_MSG_INDEX(SESSION_ABORT_DONE));
		msm_comm_generate_sys_error(inst);
		} else
		change_inst_state(inst, MSM_VIDC_CLOSE_DONE);