@@ -4,10 +4,14 @@
#ifndef IPU_ISYS_H
#define IPU_ISYS_H
+#include <linux/atomic.h>
#include <linux/container_of.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-subdev.h>
+#include <media/videobuf2-v4l2.h>
struct ipu_isys_subdev {
struct v4l2_subdev sd;
@@ -20,6 +24,94 @@ struct ipu_isys_subdev {
#define to_ipu_isys_subdev(__sd) container_of(__sd, struct ipu_isys_subdev, sd)
+struct ipu6_isys_queue {
+ struct vb2_queue vbq;
+ struct list_head node;
+ spinlock_t lock; /* Protects active and incoming lists */
+ struct list_head active;
+ struct list_head incoming;
+ unsigned int fw_output;
+};
+
+struct ipu6_isys_buffer {
+ struct list_head head;
+ atomic_t str2mmio_flag;
+};
+
+struct ipu6_isys_video_buffer {
+ struct vb2_v4l2_buffer vb_v4l2;
+ struct ipu6_isys_buffer ib;
+ dma_addr_t dma_addr;
+};
+
+struct ipu6_isys_buffer_list {
+ struct list_head head;
+ unsigned int nbufs;
+};
+
+#define vb2_queue_to_isys_queue(__vb2) \
+ container_of(__vb2, struct ipu6_isys_queue, vbq)
+
+#define ipu6_isys_to_isys_video_buffer(__ib) \
+ container_of(__ib, struct ipu6_isys_video_buffer, ib)
+
+#define vb2_buffer_to_ipu6_isys_video_buffer(__vvb) \
+ container_of(__vvb, struct ipu6_isys_video_buffer, vb_v4l2)
+
+#define ipu6_isys_buffer_to_vb2_buffer(__ib) \
+ (&ipu6_isys_to_isys_video_buffer(__ib)->vb_v4l2.vb2_buf)
+
+#define IPU6_ISYS_BUFFER_LIST_FL_INCOMING BIT(0)
+#define IPU6_ISYS_BUFFER_LIST_FL_ACTIVE BIT(1)
+#define IPU6_ISYS_BUFFER_LIST_FL_SET_STATE BIT(2)
+
+#define IPU6_ISYS_OUTPUT_PINS 11
+#define IPU6_ISYS_MAX_PARALLEL_SOF 2
+
+struct ipu6_isys_pixelformat {
+ u32 pixelformat;
+ u32 bpp;
+ u32 bpp_packed;
+ u32 code;
+ u32 css_pixelformat;
+ bool is_meta;
+};
+
+struct ipu_isys_sequence_info {
+ unsigned int sequence;
+ u64 timestamp;
+};
+
+/*
+ * Align with firmware stream. Each stream represents a CSI virtual channel.
+ * May map to multiple video devices
+ */
+struct ipu6_isys_stream {
+ struct mutex mutex;
+ struct media_entity *source_entity;
+ atomic_t sequence;
+ unsigned int seq_index;
+ struct ipu_isys_sequence_info seq[IPU6_ISYS_MAX_PARALLEL_SOF];
+ int stream_source;
+ int stream_handle;
+ unsigned int nr_output_pins;
+ struct ipu_isys_subdev *asd;
+
+ int nr_queues; /* Number of capture queues */
+ int nr_streaming;
+ int streaming; /* Has streaming been really started? */
+ struct list_head queues;
+ struct completion stream_open_completion;
+ struct completion stream_close_completion;
+ struct completion stream_start_completion;
+ struct completion stream_stop_completion;
+ struct ipu6_isys *isys;
+
+ struct ipu6_isys_queue *output_pins_queue[IPU6_ISYS_OUTPUT_PINS];
+ int error;
+ u8 vc;
+};
+
int ipu_isys_get_stream_pad_fmt(struct v4l2_subdev *sd, u32 pad, u32 stream,
struct v4l2_mbus_framefmt *format);
int ipu_isys_get_stream_pad_crop(struct v4l2_subdev *sd, u32 pad, u32 stream,
@@ -20,7 +20,7 @@
#include "ipu6-dma.h"
#include "ipu6-fw-isys.h"
#include "ipu6-isys.h"
-#include "ipu6-isys-video.h"
+#include "ipu6-isys-queue.h"
static int ipu6_isys_buf_init(struct vb2_buffer *vb)
{
@@ -4,59 +4,8 @@
#ifndef IPU6_ISYS_QUEUE_H
#define IPU6_ISYS_QUEUE_H
-#include <linux/container_of.h>
-#include <linux/atomic.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/spinlock_types.h>
-
-#include <media/videobuf2-v4l2.h>
-
+#include "ipu-isys.h"
#include "ipu6-fw-isys.h"
-#include "ipu6-isys-video.h"
-
-struct ipu6_isys_stream;
-
-struct ipu6_isys_queue {
- struct vb2_queue vbq;
- struct list_head node;
- spinlock_t lock; /* Protects active and incoming lists */
- struct list_head active;
- struct list_head incoming;
- unsigned int fw_output;
-};
-
-struct ipu6_isys_buffer {
- struct list_head head;
- atomic_t str2mmio_flag;
-};
-
-struct ipu6_isys_video_buffer {
- struct vb2_v4l2_buffer vb_v4l2;
- struct ipu6_isys_buffer ib;
- dma_addr_t dma_addr;
-};
-
-#define IPU6_ISYS_BUFFER_LIST_FL_INCOMING BIT(0)
-#define IPU6_ISYS_BUFFER_LIST_FL_ACTIVE BIT(1)
-#define IPU6_ISYS_BUFFER_LIST_FL_SET_STATE BIT(2)
-
-struct ipu6_isys_buffer_list {
- struct list_head head;
- unsigned int nbufs;
-};
-
-#define vb2_queue_to_isys_queue(__vb2) \
- container_of(__vb2, struct ipu6_isys_queue, vbq)
-
-#define ipu6_isys_to_isys_video_buffer(__ib) \
- container_of(__ib, struct ipu6_isys_video_buffer, ib)
-
-#define vb2_buffer_to_ipu6_isys_video_buffer(__vvb) \
- container_of(__vvb, struct ipu6_isys_video_buffer, vb_v4l2)
-
-#define ipu6_isys_buffer_to_vb2_buffer(__ib) \
- (&ipu6_isys_to_isys_video_buffer(__ib)->vb_v4l2.vb2_buf)
void ipu6_isys_buffer_list_queue(struct ipu6_isys_buffer_list *bl,
unsigned long op_flags,
@@ -13,59 +13,7 @@
#include <media/media-entity.h>
#include <media/v4l2-dev.h>
-#include "ipu6-isys-queue.h"
-
-#define IPU6_ISYS_OUTPUT_PINS 11
-#define IPU6_ISYS_MAX_PARALLEL_SOF 2
-
-struct file;
-struct ipu6_isys;
-struct ipu6_isys_csi2;
-struct ipu_isys_subdev;
-
-struct ipu6_isys_pixelformat {
- u32 pixelformat;
- u32 bpp;
- u32 bpp_packed;
- u32 code;
- u32 css_pixelformat;
- bool is_meta;
-};
-
-struct sequence_info {
- unsigned int sequence;
- u64 timestamp;
-};
-
-/*
- * Align with firmware stream. Each stream represents a CSI virtual channel.
- * May map to multiple video devices
- */
-struct ipu6_isys_stream {
- struct mutex mutex;
- struct media_entity *source_entity;
- atomic_t sequence;
- unsigned int seq_index;
- struct sequence_info seq[IPU6_ISYS_MAX_PARALLEL_SOF];
- int stream_source;
- int stream_handle;
- unsigned int nr_output_pins;
- struct ipu_isys_subdev *asd;
-
- int nr_queues; /* Number of capture queues */
- int nr_streaming;
- int streaming; /* Has streaming been really started? */
- struct list_head queues;
- struct completion stream_open_completion;
- struct completion stream_close_completion;
- struct completion stream_start_completion;
- struct completion stream_stop_completion;
- struct ipu6_isys *isys;
-
- struct ipu6_isys_queue *output_pins_queue[IPU6_ISYS_OUTPUT_PINS];
- int error;
- u8 vc;
-};
+#include "ipu-isys.h"
struct video_stream_watermark {
u32 width;
@@ -37,6 +37,7 @@
#include "ipu6-dma.h"
#include "ipu6-isys.h"
#include "ipu6-isys-csi2.h"
+#include "ipu6-isys-queue.h"
#include "ipu6-mmu.h"
#include "ipu6-platform-buttress-regs.h"
#include "ipu6-platform-isys-csi2-reg.h"
Move some structures that will be reused in ipu7 to ipu-isys.h file. Use one header file instead of multiple, since we frequently include most of ipu6-*.h headers in c files anyways. Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> --- drivers/media/pci/intel/ipu6/ipu-isys.h | 92 +++++++++++++++++++ .../media/pci/intel/ipu6/ipu6-isys-queue.c | 2 +- .../media/pci/intel/ipu6/ipu6-isys-queue.h | 53 +---------- .../media/pci/intel/ipu6/ipu6-isys-video.h | 54 +---------- drivers/media/pci/intel/ipu6/ipu6-isys.c | 1 + 5 files changed, 96 insertions(+), 106 deletions(-)