浏览代码

msm: eva: Add FW 17 support due to HFI change

Non-secure ARP and CRC in BUFFER_TYPE, enabling IFPC.

Change-Id: I551e29e7770cdfd83b0ed9f7f925fb8bd6e6a4a6
Signed-off-by: George Shen <[email protected]>
George Shen 2 年之前
父节点
当前提交
d665182aed
共有 3 个文件被更改,包括 8 次插入6 次删除
  1. 2 0
      include/uapi/eva/media/msm_eva_private.h
  2. 5 5
      msm/eva/msm_cvp_buf.c
  3. 1 1
      msm/eva/msm_cvp_debug.c

+ 2 - 0
include/uapi/eva/media/msm_eva_private.h

@@ -129,6 +129,8 @@ struct cvp_buf_type {
 	__u32 fence_type;
 	__u32 input_handle;
 	__u32 output_handle;
+	__u32 debug_flags;
+	__u32 crc;
 };
 
 /**

+ 5 - 5
msm/eva/msm_cvp_buf.c

@@ -1794,10 +1794,10 @@ struct cvp_internal_buf *cvp_allocate_arp_bufs(struct msm_cvp_inst *inst,
 	if (!buffer_size)
 		return NULL;
 
-	/* PERSIST buffer requires secure mapping
-	 * Disable and wait for hyp_assign available
+	/* If PERSIST buffer requires secure mapping, uncomment
+	 * below flags setting
+	 * smem_flags |= SMEM_SECURE | SMEM_NON_PIXEL;
 	 */
-	smem_flags |= SMEM_SECURE | SMEM_NON_PIXEL;
 
 	buf = cvp_kmem_cache_zalloc(&cvp_driver->buf_cache, GFP_KERNEL);
 	if (!buf) {
@@ -1812,7 +1812,7 @@ struct cvp_internal_buf *cvp_allocate_arp_bufs(struct msm_cvp_inst *inst,
 	}
 
 	buf->smem->flags = smem_flags;
-	rc = msm_cvp_smem_alloc(buffer_size, 1, 0,
+	rc = msm_cvp_smem_alloc(buffer_size, 1, 0, /* 0: no mapping in kernel space */
 		&(inst->core->resources), buf->smem);
 	if (rc) {
 		dprintk(CVP_ERR, "Failed to allocate ARP memory\n");
@@ -1954,7 +1954,7 @@ int cvp_allocate_dsp_bufs(struct msm_cvp_inst *inst,
 	rc = msm_cvp_smem_alloc(buffer_size, 1, 0,
 			&(inst->core->resources), buf->smem);
 	if (rc) {
-		dprintk(CVP_ERR, "Failed to allocate ARP memory\n");
+		dprintk(CVP_ERR, "Failed to allocate DSP buf\n");
 		goto err_no_mem;
 	}
 	buf->smem->pkt_type = buf->smem->buf_idx = 0;

+ 1 - 1
msm/eva/msm_cvp_debug.c

@@ -20,7 +20,7 @@ EXPORT_SYMBOL(msm_cvp_debug_out);
 
 int msm_cvp_fw_debug = 0x18;
 int msm_cvp_fw_debug_mode = 1;
-int msm_cvp_fw_low_power_mode = 0;	/*disable during initial stage*/
+int msm_cvp_fw_low_power_mode = 1;
 bool msm_cvp_fw_coverage = !true;
 bool msm_cvp_auto_pil = true;
 bool msm_cvp_cacheop_enabled = true;