Commit 6048fc1c authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Remove continuous mode support 

Continues mode is a special mode where 2 /dev/video devices can be active
at the same time. Either the video-preview + video nodes or the
viewfinder (for still capture) + capture nodes.

For the video-preview + video-recording case modern userspace will
use a single stream multiplexed by pipewire.

The still-capture case is extra special only starting the preview
stream and then relying on a custom ATOMISP_IOC_S_CONT_CAPTURE_CONFIG
ioctl to set things up followed by a second stream on to capture
the amount of configured still pictures. While running the sensor
at full resolution all the time. This case too is better handled
with dma-buf + GPU downscaling for the view-finder rather then all this
custom special code. Besises this the ioctl expects a bunch of special
non error checked conditions to be met otherwise things will crash/hang.

The continues mode also involves a special cases all over the code
getting in the way of further cleanups and simplifying the code to
using just 1 /dev/video# node. So lets remove it and the
related custom ATOMISP_IOC_S_CONT_CAPTURE_CONFIG ioctl.

Link: https://lore.kernel.org/linux-media/ea81b17b-7d1f-a5e1-11dd-04db310e1e50@redhat.com/
Link: https://lore.kernel.org/r/20230221145906.8113-3-hdegoede@redhat.com



Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent d33b94c0

drivers/staging/media/atomisp/include/linux/atomisp.h

+0 −23
Original line number Diff line number Diff line
@@ -299,26 +299,6 @@ struct atomisp_3a_statistics { 
	u32 isp_config_id; /* isp config ID */

};



/**

 * struct atomisp_cont_capture_conf - continuous capture parameters

 * @num_captures: number of still images to capture

 * @skip_frames: number of frames to skip between 2 captures

 * @offset: offset in ring buffer to start capture

 *

 * For example, to capture 1 frame from past, current, and 1 from future

 * and skip one frame between each capture, parameters would be:

 * num_captures:3

 * skip_frames:1

 * offset:-2

 */



struct atomisp_cont_capture_conf {

	int num_captures;

	unsigned int skip_frames;

	int offset;

	__u32 reserved[5];

};



struct atomisp_ae_window {

	int x_left;

	int x_right;
@@ -958,9 +938,6 @@ struct atomisp_sensor_ae_bracketing_lut { 
#define ATOMISP_IOC_S_PARAMETERS \

	_IOW('v', BASE_VIDIOC_PRIVATE + 32, struct atomisp_parameters)



#define ATOMISP_IOC_S_CONT_CAPTURE_CONFIG \

	_IOWR('v', BASE_VIDIOC_PRIVATE + 33, struct atomisp_cont_capture_conf)



#define ATOMISP_IOC_G_METADATA \

	_IOWR('v', BASE_VIDIOC_PRIVATE + 34, struct atomisp_metadata)

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

+60 −522

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −3
Original line number Diff line number Diff line
@@ -268,9 +268,6 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f); 
int atomisp_set_shading_table(struct atomisp_sub_device *asd,

			      struct atomisp_shading_table *shading_table);



int atomisp_offline_capture_configure(struct atomisp_sub_device *asd,

				      struct atomisp_cont_capture_conf *cvf_config);



void atomisp_free_internal_buffers(struct atomisp_sub_device *asd);



int atomisp_s_ae_window(struct atomisp_sub_device *asd,

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

+13 −57

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −56

File changed.

Preview size limit exceeded, changes collapsed.