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

Commit 29695317 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: enable VFE 4.4 on APQ8084"

parents 85f3cbfe ddbe3777

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

+5 −0
Original line number Diff line number Diff line
@@ -28,12 +28,17 @@ 
#include "msm_isp_axi_util.h"

#include "msm_isp_stats_util.h"

#include "msm_sd.h"

#include "msm_isp44.h"

#include "msm_isp40.h"

#include "msm_isp32.h"



static struct msm_sd_req_vb2_q vfe_vb2_ops;



static const struct of_device_id msm_vfe_dt_match[] = {

	{

		.compatible = "qcom,vfe44",

		.data = &vfe44_hw_info,

	},

	{

		.compatible = "qcom,vfe40",

		.data = &vfe40_hw_info,

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

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ struct msm_vfe_core_ops { 
};

struct msm_vfe_stats_ops {

	int (*get_stats_idx) (enum msm_isp_stats_type stats_type);

	int (*check_streams) (struct msm_vfe_stats_stream *stream_info);

	void (*cfg_framedrop) (struct vfe_device *vfe_dev,

		struct msm_vfe_stats_stream *stream_info);

	void (*clear_framedrop) (struct vfe_device *vfe_dev,

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

+7 −0
Original line number Diff line number Diff line
@@ -860,6 +860,12 @@ static int msm_vfe32_get_stats_idx(enum msm_isp_stats_type stats_type) 
	}

}



static int msm_vfe32_stats_check_streams(

	struct msm_vfe_stats_stream *stream_info)

{

	return 0;

}



static void msm_vfe32_stats_cfg_comp_mask(struct vfe_device *vfe_dev,

	uint32_t stats_mask, uint8_t enable)

{
@@ -1130,6 +1136,7 @@ struct msm_vfe_hardware_info vfe32_hw_info = { 
		},

		.stats_ops = {

			.get_stats_idx = msm_vfe32_get_stats_idx,

			.check_streams = msm_vfe32_stats_check_streams,

			.cfg_comp_mask = msm_vfe32_stats_cfg_comp_mask,

			.cfg_wm_irq_mask = msm_vfe32_stats_cfg_wm_irq_mask,

			.clear_wm_irq_mask = msm_vfe32_stats_clear_wm_irq_mask,

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

+7 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,12 @@ static int msm_vfe40_get_stats_idx(enum msm_isp_stats_type stats_type) 
	}

}



static int msm_vfe40_stats_check_streams(

	struct msm_vfe_stats_stream *stream_info)

{

	return 0;

}



static void msm_vfe40_stats_cfg_comp_mask(struct vfe_device *vfe_dev,

	uint32_t stats_mask, uint8_t enable)

{
@@ -1458,6 +1464,7 @@ struct msm_vfe_hardware_info vfe40_hw_info = { 
		},

		.stats_ops = {

			.get_stats_idx = msm_vfe40_get_stats_idx,

			.check_streams = msm_vfe40_stats_check_streams,

			.cfg_comp_mask = msm_vfe40_stats_cfg_comp_mask,

			.cfg_wm_irq_mask = msm_vfe40_stats_cfg_wm_irq_mask,

			.clear_wm_irq_mask = msm_vfe40_stats_clear_wm_irq_mask,

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

+148 −214

File changed.

Preview size limit exceeded, changes collapsed.