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

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

Merge "msm: ais: Resync to PC372"

parents f3dc75f0 1519ad2b

drivers/media/platform/msm/ais/cam_cdm/cam_cdm_core_common.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -280,6 +280,7 @@ int cam_cdm_stream_ops_internal(void *hw_priv, 
			ahb_vote.type = CAM_VOTE_ABSOLUTE;

			ahb_vote.vote.level = CAM_SVS_VOTE;

			axi_vote.compressed_bw = CAM_CPAS_DEFAULT_AXI_BW;

			axi_vote.compressed_bw_ab = CAM_CPAS_DEFAULT_AXI_BW;

			axi_vote.uncompressed_bw = CAM_CPAS_DEFAULT_AXI_BW;



			rc = cam_cpas_start(core->cpas_handle,

drivers/media/platform/msm/ais/cam_cdm/cam_cdm_hw_core.c

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ int cam_hw_cdm_probe(struct platform_device *pdev) 
	ahb_vote.type = CAM_VOTE_ABSOLUTE;

	ahb_vote.vote.level = CAM_SVS_VOTE;

	axi_vote.compressed_bw = CAM_CPAS_DEFAULT_AXI_BW;

	axi_vote.compressed_bw_ab = CAM_CPAS_DEFAULT_AXI_BW;

	axi_vote.uncompressed_bw = CAM_CPAS_DEFAULT_AXI_BW;

	rc = cam_cpas_start(cdm_core->cpas_handle, &ahb_vote, &axi_vote);

	if (rc) {

drivers/media/platform/msm/ais/cam_cdm/cam_cdm_virtual_core.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int cam_virtual_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
			(len >= cdm_cmd->cmd[i].offset)) {





			if ((len - cdm_cmd->cmd[i].offset) <=

			if ((len - cdm_cmd->cmd[i].offset) <

				cdm_cmd->cmd[i].len) {

				CAM_ERR(CAM_CDM, "Not enough buffer");

				rc = -EINVAL;

drivers/media/platform/msm/ais/cam_core/cam_context.c

+2 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int cam_context_dump_pf_info(struct cam_context *ctx, unsigned long iova, 
		rc = ctx->state_machine[ctx->state].pagefault_ops(ctx, iova,

			buf_info);

	} else {

		CAM_WARN(CAM_CORE, "No dump ctx in dev %d, state %d",

		CAM_INFO(CAM_CORE, "No dump ctx in dev %d, state %d",

			ctx->dev_hdl, ctx->state);

	}

	mutex_unlock(&ctx->ctx_mutex);
@@ -528,7 +528,7 @@ int cam_context_init(struct cam_context *ctx, 
	mutex_init(&ctx->sync_mutex);

	spin_lock_init(&ctx->lock);



	ctx->dev_name = dev_name;

	strlcpy(ctx->dev_name, dev_name, CAM_CTX_DEV_NAME_MAX_LENGTH);

	ctx->dev_id = dev_id;

	ctx->ctx_id = ctx_id;

	ctx->last_flush_req = 0;

drivers/media/platform/msm/ais/cam_core/cam_context.h

+5 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,9 @@ 
/* Forward declarations */

struct cam_context;



/* max device name string length*/

#define CAM_CTX_DEV_NAME_MAX_LENGTH 20



/* max request number */

#define CAM_CTX_REQ_MAX              20

#define CAM_CTX_CFG_MAX              20
@@ -184,7 +187,7 @@ struct cam_ctx_ops { 
 *

 */

struct cam_context {

	const char                  *dev_name;

	char                         dev_name[CAM_CTX_DEV_NAME_MAX_LENGTH];

	uint64_t                     dev_id;

	uint32_t                     ctx_id;

	struct list_head             list;