Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f6cf7d9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: npu: Fix formatting errors"

parents f7c93ce5 318d8d9e

drivers/media/platform/msm/npu/npu_mgr.c

+5 −5
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ static void app_msg_proc(struct npu_host_ctx *host_ctx, uint32_t *msg) 
			break;

		}



		pr_debug("network id : %d\n", network->id);

		pr_debug("network id : %llu\n", network->id);

		stats_size = exe_rsp_pkt->header.size - sizeof(*exe_rsp_pkt);

		pr_debug("stats_size %d:%d\n", exe_rsp_pkt->header.size,

			stats_size);
@@ -1137,7 +1137,7 @@ static int npu_send_network_cmd(struct npu_device *npu_dev, 
		pr_err("Another cmd is pending\n");

		ret = -EBUSY;

	} else {

		pr_debug("Send cmd %d network id %d\n",

		pr_debug("Send cmd %d network id %lld\n",

			((struct ipc_cmd_header_pkt *)cmd_ptr)->cmd_type,

			network->id);

		network->cmd_async = async;
@@ -1678,7 +1678,7 @@ int32_t npu_host_unload_network(struct npu_client *client, 
		goto free_network;

	}



	pr_debug("Unload network %d\n", network->id);

	pr_debug("Unload network %lld\n", network->id);

	/* prepare IPC packet for UNLOAD */

	unload_packet.header.cmd_type = NPU_IPC_CMD_UNLOAD;

	unload_packet.header.size = sizeof(struct ipc_cmd_unload_pkt);
@@ -1794,7 +1794,7 @@ int32_t npu_host_exec_network(struct npu_client *client, 
		goto exec_done;

	}



	pr_debug("execute network %d\n", network->id);

	pr_debug("execute network %lld\n", network->id);

	memset(&exec_packet, 0, sizeof(exec_packet));

	if (exec_ioctl->patching_required) {

		if ((exec_ioctl->input_layer_num != 1) ||
@@ -1929,7 +1929,7 @@ int32_t npu_host_exec_network_v2(struct npu_client *client, 
		goto exec_v2_done;

	}



	pr_debug("execute_v2 network %d\n", network->id);

	pr_debug("execute_v2 network %lld\n", network->id);

	num_patch_params = exec_ioctl->patch_buf_info_num;

	pkt_size = num_patch_params * sizeof(struct npu_patch_params_v2) +

		sizeof(*exec_packet);