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

Commit 55975a0a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'dev/msm-4.14' into msm-4.9 07/19"

parents 3c893b7e 7c96c83c

drivers/media/platform/msm/camera_v3/cam_cpas/cam_cpas_hw.c

+13 −3
Original line number Diff line number Diff line
@@ -980,8 +980,10 @@ static int cam_cpas_hw_start(void *hw_priv, void *start_args, 
		return -EINVAL;

	}



	if (!CAM_CPAS_CLIENT_VALID(client_indx))

	if (!CAM_CPAS_CLIENT_VALID(client_indx)) {

		CAM_ERR(CAM_CPAS, "Client index invalid %d", client_indx);

		return -EINVAL;

	}



	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);
@@ -1099,8 +1101,10 @@ static int cam_cpas_hw_stop(void *hw_priv, void *stop_args, 
	cmd_hw_stop = (struct cam_cpas_hw_cmd_stop *)stop_args;

	client_indx = CAM_CPAS_GET_CLIENT_IDX(cmd_hw_stop->client_handle);



	if (!CAM_CPAS_CLIENT_VALID(client_indx))

	if (!CAM_CPAS_CLIENT_VALID(client_indx)) {

		CAM_ERR(CAM_CPAS, "Client index invalid %d", client_indx);

		return -EINVAL;

	}



	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);
@@ -1162,14 +1166,20 @@ static int cam_cpas_hw_stop(void *hw_priv, void *stop_args, 
	ahb_vote.vote.level = CAM_SUSPEND_VOTE;

	rc = cam_cpas_util_apply_client_ahb_vote(cpas_hw, cpas_client,

		&ahb_vote, NULL);

	if (rc)

	if (rc) {

		CAM_ERR(CAM_CPAS, "ahb vote failed for %s rc %d",

			cpas_client->data.identifier, rc);

		goto done;

	}



	axi_vote.uncompressed_bw = 0;

	axi_vote.compressed_bw = 0;

	axi_vote.compressed_bw_ab = 0;

	rc = cam_cpas_util_apply_client_axi_vote(cpas_hw,

		cpas_client, &axi_vote);

	if (rc)

		CAM_ERR(CAM_CPAS, "axi vote failed for %s rc %d",

			cpas_client->data.identifier, rc);



done:

	mutex_unlock(&cpas_core->client_mutex[client_indx]);

drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/a5_hw/a5_core.c

+5 −1
Original line number Diff line number Diff line
@@ -464,7 +464,11 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 


	case CAM_ICP_A5_CMD_CPAS_STOP:

		if (core_info->cpas_start) {

			cam_cpas_stop(core_info->cpas_handle);

			rc = cam_cpas_stop(core_info->cpas_handle);

			if (rc) {

				CAM_ERR(CAM_ICP, "cpas stop failed %d", rc);

				return rc;

			}

			core_info->cpas_start = false;

		}

		break;

drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/bps_hw/bps_core.c

+5 −1
Original line number Diff line number Diff line
@@ -347,7 +347,11 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type, 


	case CAM_ICP_BPS_CMD_CPAS_STOP:

		if (core_info->cpas_start) {

			cam_cpas_stop(core_info->cpas_handle);

			rc = cam_cpas_stop(core_info->cpas_handle);

			if (rc) {

				CAM_ERR(CAM_ICP, "cpas stop failed %d", rc);

				return rc;

			}

			core_info->cpas_start = false;

		}

		break;

drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+6 −1
Original line number Diff line number Diff line
@@ -4077,8 +4077,13 @@ static void cam_icp_mgr_print_io_bufs(struct cam_packet *packet, 


	for (i = 0; i < packet->num_io_configs; i++) {

		for (j = 0; j < CAM_PACKET_MAX_PLANES; j++) {

			if (!io_cfg[i].mem_handle[j])

			if (!io_cfg[i].mem_handle[j]) {

				CAM_ERR(CAM_ICP,

					"Mem Handle %d is NULL for %d io config",

					j, i);

				break;

			}





			if (GET_FD_FROM_HANDLE(io_cfg[i].mem_handle[j]) ==

				GET_FD_FROM_HANDLE(pf_buf_info)) {

drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/ipe_hw/ipe_core.c

+5 −1
Original line number Diff line number Diff line
@@ -342,7 +342,11 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type, 


	case CAM_ICP_IPE_CMD_CPAS_STOP:

		if (core_info->cpas_start) {

			cam_cpas_stop(core_info->cpas_handle);

			rc = cam_cpas_stop(core_info->cpas_handle);

			if (rc) {

				CAM_ERR(CAM_ICP, "CPAS stop failed %d", rc);

				return rc;

			}

			core_info->cpas_start = false;

		}

		break;