Merge "msm: eva: Fix logging and timeout issues"

msm/eva/msm_cvp_buf.c

@@ -1246,6 +1246,8 @@ static struct msm_cvp_smem *msm_cvp_session_get_smem(struct msm_cvp_inst *inst,
 		smem->bitmap_index = MAX_DMABUF_NUMS;
 		smem->pkt_type = pkt_type;
 		smem->fd = buf->fd;
+		if (is_params_pkt(pkt_type))
+			smem->flags |= SMEM_PERSIST;
 		rc = msm_cvp_map_smem(inst, smem, "map cpu");
 		if (rc)
 			goto exit;

msm/eva/msm_cvp_internal.h

@@ -199,7 +199,7 @@ enum msm_cvp_modes {
 };
 
 #define MAX_NUM_MSGS_PER_SESSION	128
-#define CVP_MAX_WAIT_TIME	10000
+#define CVP_MAX_WAIT_TIME	2000
 
 struct cvp_session_msg {
 	struct list_head node;

msm/eva/msm_cvp_synx.c

@@ -197,7 +197,7 @@ static int cvp_wait_synx(struct synx_session *ssid, u32 *synx, u32 num_synx,
 				*synx_state = synx_get_status(ssid, h_synx);
 				if(*synx_state == SYNX_STATE_SIGNALED_SUCCESS)
 				{
-					dprintk(CVP_DBG, "%s: SYNX SIGNAl STATE SUCCESS \n", __func__);
+					dprintk(CVP_SYNX, "%s: SYNX SIGNAl STATE SUCCESS \n", __func__);
 					rc=0;
 					i++;
 					continue;