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

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

Merge "Merge commit 'a630ce57' into msm-4.9 - PC 127"

parents 340b005f dbcb9fe0

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_intf_api.h

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

/* Copyright (c) 2017-2018, 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
@@ -81,7 +81,7 @@ struct cam_cdm_acquire_data { 
	enum cam_cdm_id id;

	void *userdata;

	void (*cam_cdm_callback)(uint32_t handle, void *userdata,

		enum cam_cdm_cb_status status, uint32_t cookie);

		enum cam_cdm_cb_status status, uint64_t cookie);

	uint32_t base_array_cnt;

	struct cam_soc_reg_map *base_array[CAM_SOC_MAX_BLOCK];

	struct cam_hw_version cdm_version;
@@ -128,7 +128,7 @@ struct cam_cdm_bl_cmd { 
struct cam_cdm_bl_request {

	int flag;

	void *userdata;

	uint32_t cookie;

	uint64_t cookie;

	enum cam_cdm_bl_cmd_addr_type type;

	uint32_t cmd_arrary_count;

	struct cam_cdm_bl_cmd cmd[1];

drivers/media/platform/msm/camera/cam_core/cam_context_utils.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static int cam_context_apply_req_to_hw(struct cam_ctx_request *req, 
			ctx->dev_name, ctx->ctx_id, req->request_id);



	cfg.ctxt_to_hw_map = ctx->ctxt_to_hw_map;

	cfg.request_id = req->request_id;

	cfg.hw_update_entries = req->hw_update_entries;

	cfg.num_hw_update_entries = req->num_hw_update_entries;

	cfg.out_map_entries = req->out_map_entries;

drivers/media/platform/msm/camera/cam_core/cam_hw_mgr_intf.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ struct cam_hw_prepare_update_args { 
 * @out_map_entries:       Out map info

 * @num_out_map_entries:   Number of out map entries

 * @priv:                  Private pointer

 * @request_id:            Request ID

 *

 */

struct cam_hw_config_args {
@@ -181,6 +182,7 @@ struct cam_hw_config_args { 
	struct cam_hw_fence_map_entry  *out_map_entries;

	uint32_t                        num_out_map_entries;

	void                           *priv;

	uint64_t                        request_id;

};



/**

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ static uint32_t cam_fd_cdm_write_reg_val_pair(uint32_t *buffer, 
}



static void cam_fd_hw_util_cdm_callback(uint32_t handle, void *userdata,

	enum cam_cdm_cb_status status, uint32_t cookie)

	enum cam_cdm_cb_status status, uint64_t cookie)

{

	trace_cam_cdm_cb("FD", status);

	CAM_DBG(CAM_FD, "CDM hdl=%x, udata=%pK, status=%d, cookie=%d",

	CAM_DBG(CAM_FD, "CDM hdl=%x, udata=%pK, status=%d, cookie=%llu",

		handle, userdata, status, cookie);

}

drivers/media/platform/msm/camera/cam_icp/fw_inc/hfi_intf.h

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct hfi_mem { 
 * @msg_q: message queue hfi memory for firmware to host communication

 * @dbg_q: debug queue hfi memory for firmware debug information

 * @sec_heap: secondary heap hfi memory for firmware

 * @qdss: qdss mapped memory for fw

 * @icp_base: icp base address

 */

struct hfi_mem_info {
@@ -45,6 +46,7 @@ struct hfi_mem_info { 
	struct hfi_mem dbg_q;

	struct hfi_mem sec_heap;

	struct hfi_mem shmem;

	struct hfi_mem qdss;

	void __iomem *icp_base;

};
@@ -113,9 +115,10 @@ void cam_hfi_disable_cpu(void __iomem *icp_base); 
void cam_hfi_deinit(void __iomem *icp_base);

/**

 * hfi_set_debug_level() - set debug level

 * @a5_dbg_type: 1 for debug_q & 2 for qdss

 * @lvl: FW debug message level

 */

int hfi_set_debug_level(uint32_t lvl);

int hfi_set_debug_level(u64 a5_dbg_type, uint32_t lvl);



/**

 * hfi_enable_ipe_bps_pc() - Enable interframe pc