Browse Source

msm: eva: Remove unused dsp code

Remove unnecesary warning.

Change-Id: I6517a4eb22a9cbbb692d7e09a5b0edde54fc888d
Signed-off-by: George Shen <[email protected]>
George Shen 1 year ago
parent
commit
73269ff609
4 changed files with 1 additions and 88 deletions
  1. 0 1
      msm/eva/msm_cvp_common.c
  2. 1 1
      msm/eva/msm_cvp_core.c
  3. 0 70
      msm/eva/msm_cvp_dsp.c
  4. 0 16
      msm/eva/msm_cvp_dsp.h

+ 0 - 1
msm/eva/msm_cvp_common.c

@@ -1234,7 +1234,6 @@ void msm_cvp_ssr_handler(struct work_struct *work)
 			if (!s)
 				return;
 			print_hfi_queue_info(hdev);
-			msm_cvp_comm_kill_session(inst);
 			cvp_put_inst(s);
 		} else {
 			dprintk(CVP_WARN, "No active CVP session to abort\n");

+ 1 - 1
msm/eva/msm_cvp_core.c

@@ -388,7 +388,7 @@ release_arp:
 		if (inst->core->resources.pm_qos.off_vote_cnt > 0)
 			inst->core->resources.pm_qos.off_vote_cnt--;
 		else
-			dprintk(CVP_WARN, "%s Unexpected pm_qos off vote %d\n",
+			dprintk(CVP_INFO, "%s Unexpected pm_qos off vote %d\n",
 				__func__,
 				inst->core->resources.pm_qos.off_vote_cnt);
 		spin_unlock(&inst->core->resources.pm_qos.lock);

+ 0 - 70
msm/eva/msm_cvp_dsp.c

@@ -675,76 +675,6 @@ exit:
 	return rc;
 }
 
-int cvp_dsp_register_buffer(uint32_t session_id, uint32_t buff_fd,
-			uint32_t buff_fd_size, uint32_t buff_size,
-			uint32_t buff_offset, uint32_t buff_index,
-			uint32_t buff_fd_iova)
-{
-	struct cvp_dsp_cmd_msg cmd;
-	int rc;
-	struct cvp_dsp_apps *me = &gfa_cv;
-	struct cvp_dsp_rsp_msg rsp;
-	bool retried = false;
-
-	cmd.type = CPU2DSP_REGISTER_BUFFER;
-	cmd.session_id = session_id;
-	cmd.buff_fd = buff_fd;
-	cmd.buff_fd_size = buff_fd_size;
-	cmd.buff_size = buff_size;
-	cmd.buff_offset = buff_offset;
-	cmd.buff_index = buff_index;
-	cmd.buff_fd_iova = buff_fd_iova;
-
-	dprintk(CVP_DSP,
-		"%s: type=0x%x, buff_fd_iova=0x%x buff_index=0x%x\n",
-		__func__, cmd.type, buff_fd_iova,
-		cmd.buff_index);
-	dprintk(CVP_DSP, "%s: buff_size=0x%x session_id=0x%x\n",
-		__func__, cmd.buff_size, cmd.session_id);
-
-	mutex_lock(&me->tx_lock);
-retry:
-	rc = cvp_dsp_send_cmd_sync(&cmd, sizeof(struct cvp_dsp_cmd_msg), &rsp);
-	if (rc) {
-		dprintk(CVP_ERR, "%s send failed rc = %d\n", __func__, rc);
-		goto exit;
-	}
-
-	if (rsp.ret == CPU2DSP_EFAIL || rsp.ret == CPU2DSP_EUNSUPPORTED) {
-		dprintk(CVP_WARN, "%s, DSP return err %d\n", __func__, rsp.ret);
-		rc = -EINVAL;
-		goto exit;
-	}
-
-	if (rsp.ret == CPU2DSP_EUNAVAILABLE)
-		goto fatal_exit;
-
-	if (rsp.ret == CPU2DSP_EFATAL) {
-		if (!retried) {
-			mutex_unlock(&me->tx_lock);
-			retried = true;
-			rc = cvp_reinit_dsp();
-			mutex_lock(&me->tx_lock);
-			if (rc)
-				goto fatal_exit;
-			else
-				goto retry;
-		} else {
-			goto fatal_exit;
-		}
-	}
-
-	goto exit;
-
-fatal_exit:
-	me->state = DSP_INVALID;
-	cvp_hyp_assign_from_dsp();
-	rc = -ENOTSUPP;
-exit:
-	mutex_unlock(&me->tx_lock);
-	return rc;
-}
-
 int cvp_dsp_deregister_buffer(uint32_t session_id, uint32_t buff_fd,
 			uint32_t buff_fd_size, uint32_t buff_size,
 			uint32_t buff_offset, uint32_t buff_index,

+ 0 - 16
msm/eva/msm_cvp_dsp.h

@@ -267,22 +267,6 @@ int cvp_dsp_resume(void);
  */
 int cvp_dsp_shutdown(void);
 
-/*
- * API to register iova buffer address with CDSP
- *
- * @session_id:     cvp session id
- * @buff_fd:        buffer fd
- * @buff_fd_size:   total size of fd in bytes
- * @buff_size:      size in bytes of cvp buffer
- * @buff_offset:    buffer offset
- * @buff_index:     buffer index
- * @iova_buff_addr: IOVA buffer address
- */
-int cvp_dsp_register_buffer(uint32_t session_id, uint32_t buff_fd,
-			uint32_t buff_fd_size, uint32_t buff_size,
-			uint32_t buff_offset, uint32_t buff_index,
-			uint32_t buff_fd_iova);
-
 /*
  * API to de-register iova buffer address from CDSP
  *