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

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

Merge "msm: camera: isp: Enable write master for stats"

parents 558d13ea ae7e174c

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ struct msm_vfe_stats_ops { 


	void (*update_cgc_override)(struct vfe_device *vfe_dev,

		uint32_t stats_mask, uint8_t enable);

	void (*enable_stats_wm)(struct vfe_device *vfe_dev,

		uint32_t stats_mask, uint8_t enable);

};



enum msm_isp_hw_client {
@@ -515,6 +517,7 @@ struct msm_vfe_axi_shared_data { 
struct msm_vfe_stats_hardware_info {

	uint32_t stats_capability_mask;

	uint8_t *stats_ping_pong_offset;

	uint8_t *stats_wm_index;

	uint8_t num_stats_type;

	uint8_t num_stats_comp_mask;

};

drivers/media/platform/msm/camera_v2/isp/msm_isp32.c

+1 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,7 @@ struct msm_vfe_hardware_info vfe32_hw_info = { 
			.get_wm_mask = msm_vfe32_stats_get_wm_mask,

			.get_frame_id = msm_vfe32_stats_get_frame_id,

			.get_pingpong_status = msm_vfe32_get_pingpong_status,

			.enable_stats_wm = NULL,

		},

	},

	.dmi_reg_offset = 0x5A0,

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+1 −0
Original line number Diff line number Diff line
@@ -2274,6 +2274,7 @@ struct msm_vfe_hardware_info vfe40_hw_info = { 
			.get_pingpong_status = msm_vfe40_get_pingpong_status,

			.update_cgc_override =

				msm_vfe40_stats_update_cgc_override,

			.enable_stats_wm = NULL,

		},

		.platform_ops = {

			.get_platform_data = msm_vfe47_get_platform_data,

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+1 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,7 @@ struct msm_vfe_hardware_info vfe44_hw_info = { 
			.get_pingpong_status = msm_vfe44_get_pingpong_status,

			.update_cgc_override =

				msm_vfe44_stats_update_cgc_override,

			.enable_stats_wm = NULL,

		},

		.platform_ops = {

			.get_platform_data = msm_vfe47_get_platform_data,

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+1 −0
Original line number Diff line number Diff line
@@ -2022,6 +2022,7 @@ struct msm_vfe_hardware_info vfe46_hw_info = { 
			.get_pingpong_status = msm_vfe46_get_pingpong_status,

			.update_cgc_override =

				msm_vfe46_stats_update_cgc_override,

			.enable_stats_wm = NULL,

		},

		.platform_ops = {

			.get_platform_data = msm_vfe47_get_platform_data,