Merge "net: cnss2: Fix compile warnings in pci.c" (68756f07) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/cvp/cvp_hfi.c

+12 −11

Original line number	Diff line number	Diff line
		@@ -143,21 +143,22 @@ static inline bool is_sys_cache_present(struct venus_hfi_device *device)
		return device->res->sys_cache_present;
		}

		#define ROW_SIZE 32

		static void __dump_packet(u8 *packet, enum cvp_msg_prio log_level)
		{
		u32 c = 0, packet_size = (u32 )packet;
		const int row_size = 32;
		/*
		* row must contain enough for 0xdeadbaad * 8 to be converted into
		* "de ad ba ab " * 8 + '\0'
		*/
		char row[3 * row_size];
		char row[3 * ROW_SIZE];

		for (c = 0; c * row_size < packet_size; ++c) {
		int bytes_to_read = ((c + 1) * row_size > packet_size) ?
		packet_size % row_size : row_size;
		hex_dump_to_buffer(packet + c * row_size, bytes_to_read,
		row_size, 4, row, sizeof(row), false);
		for (c = 0; c * ROW_SIZE < packet_size; ++c) {
		int bytes_to_read = ((c + 1) * ROW_SIZE > packet_size) ?
		packet_size % ROW_SIZE : ROW_SIZE;
		hex_dump_to_buffer(packet + c * ROW_SIZE, bytes_to_read,
		ROW_SIZE, 4, row, sizeof(row), false);
		dprintk(log_level, "%s\n", row);
		}
		}
		@@ -276,11 +277,11 @@ static int __dsp_send_hfi_queue(struct venus_hfi_device *device)
		}

		if (device->dsp_flags & DSP_INIT) {
		dprintk(CVP_DBG, "%s: dsp already inited\n");
		dprintk(CVP_DBG, "%s: dsp already inited\n", __func__);
		return 0;
		}

		dprintk(CVP_DBG, "%s: hfi queue %#x size %d\n",
		dprintk(CVP_DBG, "%s: hfi queue %#llx size %d\n",
		__func__, device->dsp_iface_q_table.mem_data.dma_handle,
		device->dsp_iface_q_table.mem_data.size);
		rc = fastcvpd_video_send_cmd_hfi_queue(
		@@ -1130,7 +1131,7 @@ static int __vote_buses(struct venus_hfi_device *device,
		bus->range[1]*1000, 0);
		if (rc)
		dprintk(CVP_ERR,
		"Failed voting bus %s to ab %llu\n",
		"Failed voting bus %s to ab %u\n",
		bus->name, bus->range[1]*1000);
		#endif
		}
		@@ -1577,7 +1578,7 @@ static int __interface_dsp_queues_init(struct venus_hfi_device *dev)
		goto fail_dma_map;
		}
		dprintk(CVP_DBG,
		"%s: kvaddr %pK dma_handle %#lx iova %#lx size %d\n",
		"%s: kvaddr %pK dma_handle %#llx iova %#llx size %zd\n",
		__func__, kvaddr, dma_handle, iova, q_size);

		memset(mem_data, 0, sizeof(struct msm_smem));

drivers/media/platform/msm/cvp/hfi_response_handler.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1029,7 +1029,7 @@ static int hfi_process_sys_property_info(u32 device_id,
		default:
		dprintk(CVP_DBG,
		"%s: unknown_prop_id: %x\n",
		pkt->rg_property_data[0], __func__);
		__func__, pkt->rg_property_data[0]);
		return -ENOTSUPP;
		}

drivers/media/platform/msm/cvp/msm_cvp.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ static int msm_cvp_session_cvp_dfs_config(
		struct hfi_device *hdev;
		struct msm_cvp_dfsconfig vdfs_config;

		dprintk(CVP_DBG, "%s:: Enter inst = %d", __func__, inst);
		dprintk(CVP_DBG, "%s:: Enter inst = %pK\n", __func__, inst);

		if (!inst \|\| !inst->core \|\| !dfs_config) {
		dprintk(CVP_ERR, "%s: invalid params\n", __func__);
		@@ -295,7 +295,7 @@ static int msm_cvp_session_cvp_dfs_config(
		__func__, rc);
		} else {
		dprintk(CVP_ERR,
		"Failed in call_hfi_op for session_cvp_dfs_config\n",
		"%s: Failed in call_hfi_op for session_cvp_dfs_config\n",
		__func__);
		}
		return rc;
		@@ -309,21 +309,21 @@ static int msm_cvp_session_cvp_dfs_frame(
		struct hfi_device *hdev;
		struct msm_cvp_dfsframe vdfs_frame;

		dprintk(CVP_DBG, "%s:: Enter inst = %d", __func__, inst);
		dprintk(CVP_DBG, "%s:: Enter inst = %pK\n", __func__, inst);

		if (!inst \|\| !inst->core \|\| !dfs_frame) {
		dprintk(CVP_ERR, "%s: invalid params\n", __func__);
		return -EINVAL;
		}
		hdev = inst->core->device;
		memcpy(&vdfs_frame, dfs_frame, sizeof(struct msm_cvp_dfsconfig));
		memcpy(&vdfs_frame, dfs_frame, sizeof(vdfs_frame));

		rc = call_hfi_op(hdev, session_cvp_dfs_frame,
		(void *)inst->session, &vdfs_frame);

		if (rc) {
		dprintk(CVP_ERR,
		"Failed in call_hfi_op for session_cvp_dfs_frame\n",
		"%s: Failed in call_hfi_op for session_cvp_dfs_frame\n",
		__func__);
		}

		@@ -336,7 +336,7 @@ static int msm_cvp_session_cvp_dfs_frame_response(
		{
		int rc = 0;

		dprintk(CVP_DBG, "%s:: Enter inst = %d", __func__, inst);
		dprintk(CVP_DBG, "%s:: Enter inst = %pK\n", __func__, inst);

		if (!inst \|\| !inst->core \|\| !dfs_frame) {
		dprintk(CVP_ERR, "%s: invalid params\n", __func__);

drivers/media/platform/msm/cvp/msm_cvp_clocks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -650,7 +650,7 @@ static unsigned long msm_cvp_calc_freq(struct msm_cvp_inst *inst,
		dcvs->load_norm;

		dprintk(CVP_PROF,
		"%s: inst %pK: %x : filled len %d required freq %lu load_norm %lu\n",
		"%s: inst %pK: %x : filled len %d required freq %ld load_norm %u\n",
		__func__, inst, hash32_ptr(inst->session),
		filled_len, freq, dcvs->load_norm);

drivers/media/platform/msm/cvp/msm_smem.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -521,7 +521,8 @@ int msm_cvp_smem_cache_operations(struct dma_buf *dbuf,
		/* Return if buffer doesn't support caching */
		rc = dma_buf_get_flags(dbuf, &flags);
		if (rc) {
		dprintk(CVP_ERR, "%s: dma_buf_get_flags failed, err %d\n", rc);
		dprintk(CVP_ERR, "%s: dma_buf_get_flags failed, err %d\n",
		__func__, rc);
		return rc;
		} else if (!(flags & ION_FLAG_CACHED)) {
		return rc;