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

Commit 19be4ac7 authored by Alok Pandey's avatar Alok Pandey
Browse files

msm: camera: Enable fetch engine to support FS2 feature for IFE sdmmagpie 



This change enables fetch engine newly introduced in sdmmagpie to
support FS2 feature. Fetch engine work in frame based mode. HW sync
is enabled to trigger read once write is done.

Change-Id: I053a47b2662fb2b545f694633afac784f641d14f
Signed-off-by: default avatarSuresh Vankadara <svankada@codeaurora.org>
Signed-off-by: default avatarAlok Pandey <akumarpa@codeaurora.org>
parent aec88a64

Documentation/devicetree/bindings/media/video/msm-cam-ife-csid.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ First Level Node - CAM IFE CSID device 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid-lite170"

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200", "qcom,csid-lite170"

              or "qcom,csid-lite175".



- cell-index

Documentation/devicetree/bindings/media/video/msm-cam-vfe.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
  Usage: required

  Value type: <string>

  Definition: Should specify the compatibility string for matching the

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe-lite175", "qcom,vfe-lite170".

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe175_130",  "qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".



- cell-index

  Usage: required

arch/arm64/boot/dts/qcom/sdmmagpie-camera.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ 


	cam_csid0: qcom,csid0@acb3000 {

		cell-index = <0>;

		compatible = "qcom,csid175";

		compatible = "qcom,csid175_200";

		reg-names = "csid";

		reg = <0xacb3000 0x1000>;

		reg-cam-base = <0xb3000>;
@@ -588,7 +588,7 @@ 


	cam_vfe0: qcom,vfe0@acaf000 {

		cell-index = <0>;

		compatible = "qcom,vfe175";

		compatible = "qcom,vfe175_130";

		reg-names = "ife";

		reg = <0xacaf000 0x5200>;

		reg-cam-base = <0xaf000>;
@@ -621,7 +621,7 @@ 


	cam_csid1: qcom,csid1@acba000 {

		cell-index = <1>;

		compatible = "qcom,csid175";

		compatible = "qcom,csid175_200";

		reg-names = "csid";

		reg = <0xacba000 0x1000>;

		reg-cam-base = <0xba000>;
@@ -659,7 +659,7 @@ 


	cam_vfe1: qcom,vfe1@acb6000 {

		cell-index = <1>;

		compatible = "qcom,vfe175";

		compatible = "qcom,vfe175_130";

		reg-names = "ife";

		reg = <0xacb6000 0x5200>;

		reg-cam-base = <0xb6000>;

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+523 −58

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ enum cam_ife_hw_mgr_res_type { 
	CAM_IFE_HW_MGR_RES_CID,

	CAM_IFE_HW_MGR_RES_CSID,

	CAM_IFE_HW_MGR_RES_IFE_SRC,

	CAM_IFE_HW_MGR_RES_IFE_IN_RD,

	CAM_IFE_HW_MGR_RES_IFE_OUT,

};
@@ -108,6 +109,7 @@ struct cam_ife_hw_mgr_debug { 
 *                          one.

 * @res_list_csid:          CSID resource list

 * @res_list_ife_src:       IFE input resource list

 * @res_list_ife_in_rd      IFE input resource list for read path

 * @res_list_ife_out:       IFE output resoruces array

 * @free_res_list:          Free resources list for the branch node

 * @res_pool:               memory storage for the free resource list
@@ -128,6 +130,7 @@ struct cam_ife_hw_mgr_debug { 
 * @is_rdi_only_context     flag to specify the context has only rdi resource

 * @config_done_complete    indicator for configuration complete

 * @init_done               indicate whether init hw is done

 * @is_fe_enable            indicate whether fetch engine\read path is enabled

 */

struct cam_ife_hw_mgr_ctx {

	struct list_head                list;
@@ -141,6 +144,7 @@ struct cam_ife_hw_mgr_ctx { 
	struct list_head                res_list_ife_cid;

	struct list_head                res_list_ife_csid;

	struct list_head                res_list_ife_src;

	struct list_head                res_list_ife_in_rd;

	struct cam_ife_hw_mgr_res       res_list_ife_out[

						CAM_IFE_HW_OUT_RES_MAX];
@@ -162,6 +166,7 @@ struct cam_ife_hw_mgr_ctx { 
	uint32_t                        is_rdi_only_context;

	struct completion               config_done_complete;

	bool                            init_done;

	bool                            is_fe_enable;

};



/**