Эх сурвалжийг харах

msm: eva: Fix KW issues

Change-Id: Ia2ec86faf79959511f491025489cd5cecf56fec5
Signed-off-by: George Shen <[email protected]>
George Shen 2 жил өмнө
parent
commit
a9db98a35d

+ 1 - 1
include/uapi/eva/media/msm_eva_private.h

@@ -291,7 +291,7 @@ struct eva_kmd_fence_ctrl {
 	__u64 frame_id;
 	__u32 num_fences;
 	__u32 output_index;
-	struct eva_kmd_fence fences[MAX_HFI_FENCE_SIZE/2];
+	struct eva_kmd_fence fences[MAX_HFI_FENCE_SIZE];
 };
 
 #define MAX_FENCE_DATA_SIZE	(MAX_HFI_FENCE_SIZE + 6)

+ 2 - 2
msm/eva/msm_cvp.c

@@ -382,7 +382,7 @@ static int cvp_fence_thread(void *data)
 	struct cvp_fence_command *f;
 	struct cvp_hfi_cmd_session_hdr *pkt;
 	u32 *synx;
-	u64 ktid;
+	u64 ktid = 0;
 
 	dprintk(CVP_SYNX, "Enter %s\n", current->comm);
 
@@ -570,7 +570,7 @@ static int cvp_populate_fences( struct eva_kmd_hfi_packet *in_pkt,
 {
 #ifdef CVP_CONFIG_SYNX_V2
 	u32 i, buf_offset;
-	struct eva_kmd_fence fences[MAX_HFI_FENCE_SIZE >> 2];
+	struct eva_kmd_fence fences[MAX_HFI_FENCE_SIZE];
 	struct cvp_fence_command *f;
 	struct cvp_hfi_cmd_session_hdr *cmd_hdr;
 	struct cvp_fence_queue *q;

+ 2 - 0
msm/eva/msm_cvp_dsp.c

@@ -572,6 +572,8 @@ static void cvp_remove_dsp_sessions(void)
 			return;
 		list_for_each_safe(s, next_s,
 				&frpc_node->dsp_sessions.list) {
+			if (!s)
+				return;
 			inst = list_entry(s, struct msm_cvp_inst,
 					dsp_list);
 			if (inst) {

+ 1 - 1
msm/eva/msm_cvp_synx.h

@@ -40,7 +40,7 @@ struct cvp_fence_command {
 	u32 num_fences;
 	u32 output_index;
 	u32 type;
-	u32 synx[MAX_HFI_FENCE_SIZE/2];
+	u32 synx[MAX_HFI_FENCE_SIZE];
 	struct cvp_hfi_cmd_session_hdr *pkt;
 };
 

+ 2 - 1
msm/eva/vm/cvp_vm_main.c

@@ -53,7 +53,8 @@ static int msm_cvp_vm_start(struct msm_cvp_core *core)
 {
 	if (!core || !core->platform_data) {
 		dprintk(CVP_ERR, "%s: Invalid params %pK %pK\n",
-			__func__, core, core->platform_data);
+			__func__, core,
+				(core == NULL)? NULL: core->platform_data);
 		return -EINVAL;
 	}