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

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

Merge "msm: isp: Add pingpong status to tasklet command"

parents 2c178b1b 230ff353

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

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

/* Copyright (c) 2013-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
@@ -155,9 +155,11 @@ struct msm_vfe_irq_ops { 
		struct msm_isp_timestamp *ts);

	void (*process_axi_irq)(struct vfe_device *vfe_dev,

		uint32_t irq_status0, uint32_t irq_status1,

		uint32_t pingpong_status,

		struct msm_isp_timestamp *ts);

	void (*process_stats_irq)(struct vfe_device *vfe_dev,

		uint32_t irq_status0, uint32_t irq_status1,

		uint32_t pingpong_status,

		struct msm_isp_timestamp *ts);

	void (*config_irq)(struct vfe_device *vfe_dev,

		uint32_t irq_status0, uint32_t irq_status1,
@@ -596,6 +598,7 @@ struct msm_vfe_tasklet_queue_cmd { 
	struct list_head list;

	uint32_t vfeInterruptStatus0;

	uint32_t vfeInterruptStatus1;

	uint32_t vfe_pingpong_status;

	struct msm_isp_timestamp ts;

	uint8_t cmd_used;

	struct vfe_device *vfe_dev;

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

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

/* Copyright (c) 2013-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
@@ -4208,11 +4208,11 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev, 


void msm_isp_process_axi_irq(struct vfe_device *vfe_dev,

	uint32_t irq_status0, uint32_t irq_status1,

	struct msm_isp_timestamp *ts)

	uint32_t pingpong_status, struct msm_isp_timestamp *ts)

{

	int i, rc = 0;

	uint32_t comp_mask = 0, wm_mask = 0;

	uint32_t pingpong_status, stream_idx;

	uint32_t stream_idx;

	struct msm_vfe_axi_stream *stream_info;

	struct msm_vfe_axi_composite_info *comp_info;

	struct msm_vfe_axi_shared_data *axi_data = &vfe_dev->axi_data;
@@ -4226,8 +4226,6 @@ void msm_isp_process_axi_irq(struct vfe_device *vfe_dev, 
		return;



	ISP_DBG("%s: status: 0x%x\n", __func__, irq_status0);

	pingpong_status =

		vfe_dev->hw_info->vfe_ops.axi_ops.get_pingpong_status(vfe_dev);



	for (i = 0; i < axi_data->hw_info->num_comp_mask; i++) {

		rc = 0;

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

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

/* Copyright (c) 2013-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
@@ -54,7 +54,7 @@ void msm_isp_notify(struct vfe_device *vfe_dev, uint32_t event_type, 


void msm_isp_process_axi_irq(struct vfe_device *vfe_dev,

	uint32_t irq_status0, uint32_t irq_status1,

	struct msm_isp_timestamp *ts);

	uint32_t pingpong_status, struct msm_isp_timestamp *ts);



void msm_isp_axi_disable_all_wm(struct vfe_device *vfe_dev);

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

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

/* Copyright (c) 2013-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
@@ -256,13 +256,12 @@ static int32_t msm_isp_stats_buf_divert(struct vfe_device *vfe_dev, 


static int32_t msm_isp_stats_configure(struct vfe_device *vfe_dev,

	uint32_t stats_irq_mask, struct msm_isp_timestamp *ts,

	bool is_composite)

	uint32_t pingpong_status, bool is_composite)

{

	int i, rc = 0;

	struct msm_isp_event_data buf_event;

	struct msm_isp_stats_event *stats_event = &buf_event.u.stats;

	struct msm_vfe_stats_stream *stream_info = NULL;

	uint32_t pingpong_status;

	uint32_t comp_stats_type_mask = 0;

	int result = 0;
@@ -271,8 +270,6 @@ static int32_t msm_isp_stats_configure(struct vfe_device *vfe_dev, 
	buf_event.mono_timestamp = ts->buf_time;



	buf_event.frame_id = vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id;

	pingpong_status = vfe_dev->hw_info->

		vfe_ops.stats_ops.get_pingpong_status(vfe_dev);



	for (i = 0; i < vfe_dev->hw_info->stats_hw_info->num_stats_type; i++) {

		if (!(stats_irq_mask & (1 << i)))
@@ -309,7 +306,7 @@ static int32_t msm_isp_stats_configure(struct vfe_device *vfe_dev, 


void msm_isp_process_stats_irq(struct vfe_device *vfe_dev,

	uint32_t irq_status0, uint32_t irq_status1,

	struct msm_isp_timestamp *ts)

	uint32_t pingpong_status, struct msm_isp_timestamp *ts)

{

	int j, rc;

	uint32_t atomic_stats_mask = 0;
@@ -337,7 +334,7 @@ void msm_isp_process_stats_irq(struct vfe_device *vfe_dev, 
	/* Process non-composite irq */

	if (stats_irq_mask) {

		rc = msm_isp_stats_configure(vfe_dev, stats_irq_mask, ts,

			comp_flag);

			pingpong_status, comp_flag);

	}



	/* Process composite irq */
@@ -350,7 +347,7 @@ void msm_isp_process_stats_irq(struct vfe_device *vfe_dev, 
				&vfe_dev->stats_data.stats_comp_mask[j]);



			rc = msm_isp_stats_configure(vfe_dev, atomic_stats_mask,

				ts, !comp_flag);

				ts, pingpong_status, !comp_flag);

		}

	}

}

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, 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
@@ -17,7 +17,7 @@ 


void msm_isp_process_stats_irq(struct vfe_device *vfe_dev,

	uint32_t irq_status0, uint32_t irq_status1,

	struct msm_isp_timestamp *ts);

	uint32_t pingpong_status, struct msm_isp_timestamp *ts);

void msm_isp_stats_stream_update(struct vfe_device *vfe_dev);

int msm_isp_cfg_stats_stream(struct vfe_device *vfe_dev, void *arg);

int msm_isp_update_stats_stream(struct vfe_device *vfe_dev, void *arg);