Commit 3fcd2d42 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

media: staging: rkisp1: remove the 'is_streaming' field from stats and params 



The params and stats entities have a field 'is_streaming'.
This field is not needed since the entities can have available
buffers only if they stream and therefore it is enough to
check if there are buffers available.
As a result, their start_stream callbacks can be removed since
they only set the 'is_streaming' field.

Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 60fcc5be

drivers/staging/media/rkisp1/rkisp1-common.h

+4 −8
Original line number Diff line number Diff line
@@ -240,19 +240,17 @@ struct rkisp1_capture { 
 *

 * @vnode:	  video node

 * @rkisp1:	  pointer to the rkisp1 device

 * @lock:	  locks the buffer list 'stat' and 'is_streaming'

 * @lock:	  locks the buffer list 'stat'

 * @stat:	  queue of rkisp1_buffer

 * @vdev_fmt:	  v4l2_format of the metadata format

 * @is_streaming: device is streaming

 */

struct rkisp1_stats {

	struct rkisp1_vdev_node vnode;

	struct rkisp1_device *rkisp1;



	spinlock_t lock; /* locks the buffers list 'stats' and 'is_streaming' */

	spinlock_t lock; /* locks the buffers list 'stats' */

	struct list_head stat;

	struct v4l2_format vdev_fmt;

	bool is_streaming;

};



/*
@@ -260,10 +258,9 @@ struct rkisp1_stats { 
 *

 * @vnode:		video node

 * @rkisp1:		pointer to the rkisp1 device

 * @config_lock:	locks the buffer list 'params' and 'is_streaming'

 * @config_lock:	locks the buffer list 'params'

 * @params:		queue of rkisp1_buffer

 * @vdev_fmt:		v4l2_format of the metadata format

 * @is_streaming:	device is streaming

 * @quantization:	the quantization configured on the isp's src pad

 * @raw_type:		the bayer pattern on the isp video sink pad

 */
@@ -271,10 +268,9 @@ struct rkisp1_params { 
	struct rkisp1_vdev_node vnode;

	struct rkisp1_device *rkisp1;



	spinlock_t config_lock; /* locks the buffers list 'params' and 'is_streaming' */

	spinlock_t config_lock; /* locks the buffers list 'params' */

	struct list_head params;

	struct v4l2_format vdev_fmt;

	bool is_streaming;



	enum v4l2_quantization quantization;

	enum rkisp1_fmt_raw_pat_type raw_type;

drivers/staging/media/rkisp1/rkisp1-params.c

+1 −20
Original line number Diff line number Diff line
@@ -1224,10 +1224,6 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1) 
	struct rkisp1_params *params = &rkisp1->params;



	spin_lock(&params->config_lock);

	if (!params->is_streaming) {

		spin_unlock(&params->config_lock);

		return;

	}

	rkisp1_params_apply_params_cfg(params, frame_sequence);



	spin_unlock(&params->config_lock);
@@ -1303,7 +1299,6 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params) 
	spin_lock_irq(&params->config_lock);



	/* apply the first buffer if there is one already */

	if (params->is_streaming)

	rkisp1_params_apply_params_cfg(params, 0);



	spin_unlock_irq(&params->config_lock);
@@ -1467,7 +1462,6 @@ static void rkisp1_params_vb2_stop_streaming(struct vb2_queue *vq) 
	 * without holding the lock

	 */

	spin_lock_irq(&params->config_lock);

	params->is_streaming = false;

	list_splice_init(&params->params, &tmp_list);

	spin_unlock_irq(&params->config_lock);
@@ -1475,25 +1469,12 @@ static void rkisp1_params_vb2_stop_streaming(struct vb2_queue *vq) 
		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);

}



static int

rkisp1_params_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)

{

	struct rkisp1_params *params = queue->drv_priv;



	spin_lock_irq(&params->config_lock);

	params->is_streaming = true;

	spin_unlock_irq(&params->config_lock);



	return 0;

}



static struct vb2_ops rkisp1_params_vb2_ops = {

	.queue_setup = rkisp1_params_vb2_queue_setup,

	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

	.buf_queue = rkisp1_params_vb2_buf_queue,

	.buf_prepare = rkisp1_params_vb2_buf_prepare,

	.start_streaming = rkisp1_params_vb2_start_streaming,

	.stop_streaming = rkisp1_params_vb2_stop_streaming,



};

drivers/staging/media/rkisp1/rkisp1-stats.c

+0 −17
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ static void rkisp1_stats_vb2_stop_streaming(struct vb2_queue *vq) 
	unsigned int i;



	spin_lock_irq(&stats->lock);

	stats->is_streaming = false;

	for (i = 0; i < RKISP1_ISP_STATS_REQ_BUFS_MAX; i++) {

		if (list_empty(&stats->stat))

			break;
@@ -148,18 +147,6 @@ static void rkisp1_stats_vb2_stop_streaming(struct vb2_queue *vq) 
	spin_unlock_irq(&stats->lock);

}



static int

rkisp1_stats_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)

{

	struct rkisp1_stats *stats = queue->drv_priv;



	spin_lock_irq(&stats->lock);

	stats->is_streaming = true;

	spin_unlock_irq(&stats->lock);



	return 0;

}



static const struct vb2_ops rkisp1_stats_vb2_ops = {

	.queue_setup = rkisp1_stats_vb2_queue_setup,

	.buf_queue = rkisp1_stats_vb2_buf_queue,
@@ -167,7 +154,6 @@ static const struct vb2_ops rkisp1_stats_vb2_ops = { 
	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

	.stop_streaming = rkisp1_stats_vb2_stop_streaming,

	.start_streaming = rkisp1_stats_vb2_start_streaming,

};



static int
@@ -355,12 +341,9 @@ void rkisp1_stats_isr(struct rkisp1_stats *stats, u32 isp_ris) 
	if (isp_mis_tmp & RKISP1_STATS_MEAS_MASK)

		rkisp1->debug.stats_error++;



	if (!stats->is_streaming)

		goto unlock;

	if (isp_ris & RKISP1_STATS_MEAS_MASK)

		rkisp1_stats_send_measurement(stats, isp_ris);



unlock:

	spin_unlock(&stats->lock);

}