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

Commit ac8704ff authored by Haritha Chintalapati's avatar Haritha Chintalapati Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Stop HW immediately in flush" into camera-kernel.lnx.1.0

parents 92a98f61 aaab1ef8

drivers/cam_core/cam_context.h

+3 −2
Original line number Diff line number Diff line
@@ -32,8 +32,9 @@ enum cam_context_state { 
	CAM_CTX_AVAILABLE            = 1,

	CAM_CTX_ACQUIRED             = 2,

	CAM_CTX_READY                = 3,

	CAM_CTX_ACTIVATED            = 4,

	CAM_CTX_STATE_MAX            = 5,

	CAM_CTX_FLUSHED              = 4,

	CAM_CTX_ACTIVATED            = 5,

	CAM_CTX_STATE_MAX            = 6,

};



/**

drivers/cam_core/cam_hw_mgr_intf.h

+12 −0
Original line number Diff line number Diff line
@@ -287,6 +287,16 @@ struct cam_hw_dump_pf_args { 
	bool                           *mem_found;

};



/**

 * struct cam_hw_reset_args -hw reset arguments

 *

 * @ctxt_to_hw_map:        HW context from the acquire

 *

 */

struct cam_hw_reset_args {

	void                           *ctxt_to_hw_map;

};



/* enum cam_hw_mgr_command - Hardware manager command type */

enum cam_hw_mgr_command {

	CAM_HW_MGR_CMD_INTERNAL,
@@ -341,6 +351,7 @@ struct cam_hw_cmd_args { 
 * @hw_open:                   Function pointer for HW init

 * @hw_close:                  Function pointer for HW deinit

 * @hw_flush:                  Function pointer for HW flush

 * @hw_reset:                  Function pointer for HW reset

 *

 */

struct cam_hw_mgr_intf {
@@ -361,6 +372,7 @@ struct cam_hw_mgr_intf { 
	int (*hw_open)(void *hw_priv, void *fw_download_args);

	int (*hw_close)(void *hw_priv, void *hw_close_args);

	int (*hw_flush)(void *hw_priv, void *hw_flush_args);

	int (*hw_reset)(void *hw_priv, void *hw_reset_args);

};



#endif /* _CAM_HW_MGR_INTF_H_ */

drivers/cam_cust/cam_custom_context.c

+2 −0
Original line number Diff line number Diff line
@@ -874,6 +874,8 @@ static struct cam_ctx_ops 
		.irq_ops = NULL,

		.pagefault_ops = NULL,

	},

	/* Flushed */

	{},

	/* Activated */

	{

		.ioctl_ops = {

drivers/cam_fd/cam_fd_context.c

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ static struct cam_ctx_ops 
		.crm_ops = {},

		.irq_ops = NULL,

	},

	/* Flushed */

	{},

	/* Activated */

	{

		.ioctl_ops = {

drivers/cam_icp/cam_icp_context.c

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ static struct cam_ctx_ops 
		.irq_ops = __cam_icp_handle_buf_done_in_ready,

		.pagefault_ops = cam_icp_context_dump_active_request,

	},

	/* Flushed */

	{},

	/* Activated */

	{

		.ioctl_ops = {},