media: rkisp1: Add struct rkisp1_params_buffer

Create the 'struct rkisp1_params_buffer' type that wraps a
vb2_v4l2_buffer to prepare to hold a copy of the parameters buffer that
will be used to cache the user-provided configuration buffer in the
following patches.

Replace usage of 'struct rkisp1_buffer' with 'struct
rkisp1_params_buffer' in rkisp1-params.c to prepare for that.

Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 3ce7d477e455af969a89348616d336e378b69399..096d7962559ca1703d7893e8058d0afa9c930658 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -237,7 +237,7 @@ struct rkisp1_vdev_node {
 
 /*
  * struct rkisp1_buffer - A container for the vb2 buffers used by the video devices:
- *                       params, stats, mainpath, selfpath
+ *                       stats, mainpath, selfpath
  *
  * @vb:                vb2 buffer
  * @queue:     entry of the buffer in the queue
@@ -249,6 +249,18 @@ struct rkisp1_buffer {
        dma_addr_t buff_addr[VIDEO_MAX_PLANES];
 };
 
+/*
+ * struct rkisp1_params_buffer - A container for the vb2 buffers used by the
+ *                              params video device
+ *
+ * @vb:                vb2 buffer
+ * @queue:     entry of the buffer in the queue
+ */
+struct rkisp1_params_buffer {
+       struct vb2_v4l2_buffer vb;
+       struct list_head queue;
+};
+
 /*
  * struct rkisp1_dummy_buffer - A buffer to write the next frame to in case
  *                             there are no vb2 buffers available.

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 173d1ea4187482123232b1540446784f9f198167..2844e55bc4f2fb79ab284cf6e82fa8b19e11c0bd 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1502,20 +1502,21 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
 }
 
 static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
-                                    struct rkisp1_buffer **buf,
+                                    struct rkisp1_params_buffer **buf,
                                     struct rkisp1_params_cfg **cfg)
 {
        if (list_empty(&params->params))
                return false;
 
-       *buf = list_first_entry(&params->params, struct rkisp1_buffer, queue);
+       *buf = list_first_entry(&params->params, struct rkisp1_params_buffer,
+                               queue);
        *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
 
        return true;
 }
 
 static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
-                                         struct rkisp1_buffer *buf,
+                                         struct rkisp1_params_buffer *buf,
                                          unsigned int frame_sequence)
 {
        list_del(&buf->queue);
@@ -1528,7 +1529,7 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1)
 {
        struct rkisp1_params *params = &rkisp1->params;
        struct rkisp1_params_cfg *new_params;
-       struct rkisp1_buffer *cur_buf;
+       struct rkisp1_params_buffer *cur_buf;
 
        spin_lock(&params->config_lock);
 
@@ -1604,7 +1605,7 @@ void rkisp1_params_pre_configure(struct rkisp1_params *params,
 {
        struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
        struct rkisp1_params_cfg *new_params;
-       struct rkisp1_buffer *cur_buf;
+       struct rkisp1_params_buffer *cur_buf;
 
        params->quantization = quantization;
        params->ycbcr_encoding = ycbcr_encoding;
@@ -1650,7 +1651,7 @@ unlock:
 void rkisp1_params_post_configure(struct rkisp1_params *params)
 {
        struct rkisp1_params_cfg *new_params;
-       struct rkisp1_buffer *cur_buf;
+       struct rkisp1_params_buffer *cur_buf;
 
        spin_lock_irq(&params->config_lock);
 
@@ -1821,8 +1822,8 @@ static int rkisp1_params_vb2_queue_setup(struct vb2_queue *vq,
 static void rkisp1_params_vb2_buf_queue(struct vb2_buffer *vb)
 {
        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-       struct rkisp1_buffer *params_buf =
-               container_of(vbuf, struct rkisp1_buffer, vb);
+       struct rkisp1_params_buffer *params_buf =
+               container_of(vbuf, struct rkisp1_params_buffer, vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct rkisp1_params *params = vq->drv_priv;
 
@@ -1844,7 +1845,7 @@ static int rkisp1_params_vb2_buf_prepare(struct vb2_buffer *vb)
 static void rkisp1_params_vb2_stop_streaming(struct vb2_queue *vq)
 {
        struct rkisp1_params *params = vq->drv_priv;
-       struct rkisp1_buffer *buf;
+       struct rkisp1_params_buffer *buf;
        LIST_HEAD(tmp_list);
 
        /*
@@ -1890,7 +1891,7 @@ static int rkisp1_params_init_vb2_queue(struct vb2_queue *q,
        q->drv_priv = params;
        q->ops = &rkisp1_params_vb2_ops;
        q->mem_ops = &vb2_vmalloc_memops;
-       q->buf_struct_size = sizeof(struct rkisp1_buffer);
+       q->buf_struct_size = sizeof(struct rkisp1_params_buffer);
        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
        q->lock = &node->vlock;