Commit 20734fca authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Drop atomisp_init_pipe() 



atomisp_init_pipe() does 3 things:

1. Init a bunch of list-heads / locks
2. Init the vb_queue for the videodev (aka pipe)
3. zero the per-frame parameters related variables of the pipe

1. and 2. really should not be done at file-open time, but once at probe.
Currently the code is getting away with doing this on every videodev-open
because only 1 open is allowed at a time.

1. is already done at probe time by atomisp_init_subdev_pipe(), move 2. to
atomisp_init_subdev_pipe() so that it is also done once at probe.

As for 3. The per-frame parameters can only be set from a qbuf ioctl,
which can only happen after a reqbufs ioctl and atomisp_buf_cleanup
already zeros the per-frame parameters when the buffers are released,
so 3. is not necessary at all.

Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8972ed6e

drivers/staging/media/atomisp/pci/atomisp_fops.c

+1 −39
Original line number Original line Diff line number Diff line
@@ -624,7 +624,7 @@ static void atomisp_buf_cleanup(struct vb2_buffer *vb) 
	hmm_free(frame->data);

	hmm_free(frame->data);

}

}





static const struct vb2_ops atomisp_vb2_ops = {

const struct vb2_ops atomisp_vb2_ops = {

	.queue_setup		= atomisp_queue_setup,

	.queue_setup		= atomisp_queue_setup,

	.buf_init		= atomisp_buf_init,

	.buf_init		= atomisp_buf_init,

	.buf_cleanup		= atomisp_buf_cleanup,

	.buf_cleanup		= atomisp_buf_cleanup,
@@ -633,40 +633,6 @@ static const struct vb2_ops atomisp_vb2_ops = { 
	.stop_streaming		= atomisp_stop_streaming,

	.stop_streaming		= atomisp_stop_streaming,

};

};





static int atomisp_init_pipe(struct atomisp_video_pipe *pipe)

{

	int ret;



	/* init locks */

	spin_lock_init(&pipe->irq_lock);

	mutex_init(&pipe->vb_queue_mutex);



	/* Init videobuf2 queue structure */

	pipe->vb_queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	pipe->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR;

	pipe->vb_queue.buf_struct_size = sizeof(struct ia_css_frame);

	pipe->vb_queue.ops = &atomisp_vb2_ops;

	pipe->vb_queue.mem_ops = &vb2_vmalloc_memops;

	pipe->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	ret = vb2_queue_init(&pipe->vb_queue);

	if (ret)

		return ret;



	pipe->vdev.queue = &pipe->vb_queue;

	pipe->vdev.queue->lock = &pipe->vb_queue_mutex;



	INIT_LIST_HEAD(&pipe->activeq);

	INIT_LIST_HEAD(&pipe->buffers_waiting_for_param);

	INIT_LIST_HEAD(&pipe->per_frame_params);

	memset(pipe->frame_request_config_id, 0,

	       VIDEO_MAX_FRAME * sizeof(unsigned int));

	memset(pipe->frame_params, 0,

	       VIDEO_MAX_FRAME *

	       sizeof(struct atomisp_css_params_with_list *));



	return 0;

}



static void atomisp_dev_init_struct(struct atomisp_device *isp)

static void atomisp_dev_init_struct(struct atomisp_device *isp)

{

{

	unsigned int i;

	unsigned int i;
@@ -773,10 +739,6 @@ static int atomisp_open(struct file *file) 
		return -EBUSY;

		return -EBUSY;

	}

	}





	ret = atomisp_init_pipe(pipe);

	if (ret)

		goto error;



	if (atomisp_dev_users(isp)) {

	if (atomisp_dev_users(isp)) {

		dev_dbg(isp->dev, "skip init isp in open\n");

		dev_dbg(isp->dev, "skip init isp in open\n");

		goto init_subdev;

		goto init_subdev;

drivers/staging/media/atomisp/pci/atomisp_fops.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ unsigned int atomisp_sub_dev_users(struct atomisp_sub_device *asd); 




int atomisp_qbuffers_to_css(struct atomisp_sub_device *asd);

int atomisp_qbuffers_to_css(struct atomisp_sub_device *asd);





extern const struct vb2_ops atomisp_vb2_ops;

extern const struct v4l2_file_operations atomisp_fops;

extern const struct v4l2_file_operations atomisp_fops;





#endif /* __ATOMISP_FOPS_H__ */
 
#endif /* __ATOMISP_FOPS_H__ */

drivers/staging/media/atomisp/pci/atomisp_subdev.c

+39 −10
Original line number Original line Diff line number Diff line
@@ -25,9 +25,11 @@ 




#include <media/v4l2-event.h>

#include <media/v4l2-event.h>

#include <media/v4l2-mediabus.h>

#include <media/v4l2-mediabus.h>

#include <media/videobuf2-vmalloc.h>

#include "atomisp_cmd.h"

#include "atomisp_cmd.h"

#include "atomisp_common.h"

#include "atomisp_common.h"

#include "atomisp_compat.h"

#include "atomisp_compat.h"

#include "atomisp_fops.h"

#include "atomisp_internal.h"

#include "atomisp_internal.h"





const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = {

const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = {
@@ -1023,14 +1025,31 @@ static const struct v4l2_ctrl_config ctrl_depth_mode = { 
	.def = 0,

	.def = 0,

};

};





static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,

static int atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,

				    struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type)

				    struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type)

{

{

	int ret;



	pipe->type = buf_type;

	pipe->type = buf_type;

	pipe->asd = asd;

	pipe->asd = asd;

	pipe->isp = asd->isp;

	pipe->isp = asd->isp;

	spin_lock_init(&pipe->irq_lock);

	spin_lock_init(&pipe->irq_lock);

	mutex_init(&pipe->vb_queue_mutex);

	mutex_init(&pipe->vb_queue_mutex);



	/* Init videobuf2 queue structure */

	pipe->vb_queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	pipe->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR;

	pipe->vb_queue.buf_struct_size = sizeof(struct ia_css_frame);

	pipe->vb_queue.ops = &atomisp_vb2_ops;

	pipe->vb_queue.mem_ops = &vb2_vmalloc_memops;

	pipe->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	ret = vb2_queue_init(&pipe->vb_queue);

	if (ret)

		return ret;



	pipe->vdev.queue = &pipe->vb_queue;

	pipe->vdev.queue->lock = &pipe->vb_queue_mutex;



	INIT_LIST_HEAD(&pipe->buffers_in_css);

	INIT_LIST_HEAD(&pipe->buffers_in_css);

	INIT_LIST_HEAD(&pipe->activeq);

	INIT_LIST_HEAD(&pipe->activeq);

	INIT_LIST_HEAD(&pipe->buffers_waiting_for_param);

	INIT_LIST_HEAD(&pipe->buffers_waiting_for_param);
@@ -1040,6 +1059,8 @@ static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd, 
	memset(pipe->frame_params,

	memset(pipe->frame_params,

	       0, VIDEO_MAX_FRAME *

	       0, VIDEO_MAX_FRAME *

	       sizeof(struct atomisp_css_params_with_list *));

	       sizeof(struct atomisp_css_params_with_list *));



	return 0;

}

}





/*

/*
@@ -1085,17 +1106,25 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd) 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	atomisp_init_subdev_pipe(asd, &asd->video_out_preview,

	ret = atomisp_init_subdev_pipe(asd, &asd->video_out_preview,

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

	if (ret)

		return ret;





	atomisp_init_subdev_pipe(asd, &asd->video_out_vf,

	ret = atomisp_init_subdev_pipe(asd, &asd->video_out_vf,

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

	if (ret)

		return ret;





	atomisp_init_subdev_pipe(asd, &asd->video_out_capture,

	ret = atomisp_init_subdev_pipe(asd, &asd->video_out_capture,

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

	if (ret)

		return ret;





	atomisp_init_subdev_pipe(asd, &asd->video_out_video_capture,

	ret = atomisp_init_subdev_pipe(asd, &asd->video_out_video_capture,

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

				       V4L2_BUF_TYPE_VIDEO_CAPTURE);

	if (ret)

		return ret;





	ret = atomisp_video_init(&asd->video_out_capture, "CAPTURE",

	ret = atomisp_video_init(&asd->video_out_capture, "CAPTURE",

				 ATOMISP_RUN_MODE_STILL_CAPTURE);

				 ATOMISP_RUN_MODE_STILL_CAPTURE);