media: rockchip: rga: move cmdbuf to rga_ctx

Move the command buffer to the rga_ctx struct in preparation to reuse
an already prepared command buffer. This allows to split the command
buffer setup in a further commit to setup a template for the command
buffer at streamon and only update the buffer addresses in device_run
and trigger the command stream. No sync point is added, as one command
buffer should only be used for one conversion at a time.

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c
index 17f7a67c0b4bb6f6391f6a69abf2b57eef4022b1..9881c14f908d5340347b52f686195e251aec1884 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga-hw.c
@@ -122,8 +122,7 @@ static struct rga_addr_offset *rga_lookup_draw_pos(struct
 
 static void rga_cmd_set_src_addr(struct rga_ctx *ctx, dma_addr_t dma_addr)
 {
-       struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        unsigned int reg;
 
        reg = RGA_MMU_SRC_BASE - RGA_MODE_BASE_REG;
@@ -135,8 +134,7 @@ static void rga_cmd_set_src_addr(struct rga_ctx *ctx, dma_addr_t dma_addr)
 
 static void rga_cmd_set_src1_addr(struct rga_ctx *ctx, dma_addr_t dma_addr)
 {
-       struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        unsigned int reg;
 
        reg = RGA_MMU_SRC1_BASE - RGA_MODE_BASE_REG;
@@ -148,8 +146,7 @@ static void rga_cmd_set_src1_addr(struct rga_ctx *ctx, dma_addr_t dma_addr)
 
 static void rga_cmd_set_dst_addr(struct rga_ctx *ctx, dma_addr_t dma_addr)
 {
-       struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        unsigned int reg;
 
        reg = RGA_MMU_DST_BASE - RGA_MODE_BASE_REG;
@@ -162,7 +159,7 @@ static void rga_cmd_set_dst_addr(struct rga_ctx *ctx, dma_addr_t dma_addr)
 static void rga_cmd_set_trans_info(struct rga_ctx *ctx)
 {
        struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        unsigned int scale_dst_w, scale_dst_h;
        unsigned int src_h, src_w, dst_h, dst_w;
        union rga_src_info src_info;
@@ -322,8 +319,7 @@ static void rga_cmd_set_src_info(struct rga_ctx *ctx,
                                 struct rga_addr_offset *offset)
 {
        struct rga_corners_addr_offset src_offsets;
-       struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        unsigned int src_h, src_w, src_x, src_y;
 
        src_h = ctx->in.crop.height;
@@ -350,8 +346,7 @@ static void rga_cmd_set_dst_info(struct rga_ctx *ctx,
 {
        struct rga_addr_offset *dst_offset;
        struct rga_corners_addr_offset offsets;
-       struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        unsigned int dst_h, dst_w, dst_x, dst_y;
        unsigned int mir_mode = 0;
        unsigned int rot_mode = 0;
@@ -397,8 +392,7 @@ static void rga_cmd_set_dst_info(struct rga_ctx *ctx,
 
 static void rga_cmd_set_mode(struct rga_ctx *ctx)
 {
-       struct rockchip_rga *rga = ctx->rga;
-       u32 *dest = rga->cmdbuf_virt;
+       u32 *dest = ctx->cmdbuf_virt;
        union rga_mode_ctrl mode;
        union rga_alpha_ctrl0 alpha_ctrl0;
        union rga_alpha_ctrl1 alpha_ctrl1;
@@ -423,7 +417,7 @@ static void rga_cmd_set(struct rga_ctx *ctx,
 {
        struct rockchip_rga *rga = ctx->rga;
 
-       memset(rga->cmdbuf_virt, 0, RGA_CMDBUF_SIZE);
+       memset(ctx->cmdbuf_virt, 0, RGA_CMDBUF_SIZE);
 
        rga_cmd_set_src_addr(ctx, src->dma_desc_pa);
        /*
@@ -439,11 +433,11 @@ static void rga_cmd_set(struct rga_ctx *ctx,
        rga_cmd_set_dst_info(ctx, &dst->offset);
        rga_cmd_set_trans_info(ctx);
 
-       rga_write(rga, RGA_CMD_BASE, rga->cmdbuf_phy);
+       rga_write(rga, RGA_CMD_BASE, ctx->cmdbuf_phy);
 
        /* sync CMD buf for RGA */
-       dma_sync_single_for_device(rga->dev, rga->cmdbuf_phy,
-               PAGE_SIZE, DMA_BIDIRECTIONAL);
+       dma_sync_single_for_device(rga->dev, ctx->cmdbuf_phy,
+                                  PAGE_SIZE, DMA_BIDIRECTIONAL);
 }
 
 static void rga_hw_start(struct rockchip_rga *rga,

diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 77b8c7ab74274b24f3d0a58d27a45f356ed68a75..bf6bbcbfc869b8daa477cf2d748d12155b091a18 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -219,6 +219,16 @@ static int rga_open(struct file *file)
        ctx = kzalloc_obj(*ctx);
        if (!ctx)
                return -ENOMEM;
+
+       /* Create CMD buffer */
+       ctx->cmdbuf_virt = dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size,
+                                          &ctx->cmdbuf_phy, GFP_KERNEL,
+                                          DMA_ATTR_WRITE_COMBINE);
+       if (!ctx->cmdbuf_virt) {
+               ret = -ENOMEM;
+               goto rel_ctx;
+       }
+
        ctx->rga = rga;
        /* Set default formats */
        ctx->in = def_frame;
@@ -230,15 +240,13 @@ static int rga_open(struct file *file)
                            ctx->out.fmt->fourcc, def_width, def_height);
 
        if (mutex_lock_interruptible(&rga->mutex)) {
-               kfree(ctx);
-               return -ERESTARTSYS;
+               ret = -ERESTARTSYS;
+               goto rel_cmdbuf;
        }
        ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(rga->m2m_dev, ctx, &queue_init);
        if (IS_ERR(ctx->fh.m2m_ctx)) {
                ret = PTR_ERR(ctx->fh.m2m_ctx);
-               mutex_unlock(&rga->mutex);
-               kfree(ctx);
-               return ret;
+               goto unlock_mutex;
        }
        v4l2_fh_init(&ctx->fh, video_devdata(file));
        v4l2_fh_add(&ctx->fh, file);
@@ -252,6 +260,15 @@ static int rga_open(struct file *file)
        mutex_unlock(&rga->mutex);
 
        return 0;
+
+unlock_mutex:
+       mutex_unlock(&rga->mutex);
+rel_cmdbuf:
+       dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt,
+                      ctx->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
+rel_ctx:
+       kfree(ctx);
+       return ret;
 }
 
 static int rga_release(struct file *file)
@@ -266,6 +283,10 @@ static int rga_release(struct file *file)
        v4l2_ctrl_handler_free(&ctx->ctrl_handler);
        v4l2_fh_del(&ctx->fh, file);
        v4l2_fh_exit(&ctx->fh);
+
+       dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt,
+                      ctx->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
+
        kfree(ctx);
 
        mutex_unlock(&rga->mutex);
@@ -720,19 +741,10 @@ static int rga_probe(struct platform_device *pdev)
 
        pm_runtime_put(rga->dev);
 
-       /* Create CMD buffer */
-       rga->cmdbuf_virt = dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size,
-                                          &rga->cmdbuf_phy, GFP_KERNEL,
-                                          DMA_ATTR_WRITE_COMBINE);
-       if (!rga->cmdbuf_virt) {
-               ret = -ENOMEM;
-               goto rel_m2m;
-       }
-
        ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&rga->v4l2_dev, "Failed to register video device\n");
-               goto free_dma;
+               goto rel_m2m;
        }
 
        v4l2_info(&rga->v4l2_dev, "Registered %s as /dev/%s\n",
@@ -740,9 +752,6 @@ static int rga_probe(struct platform_device *pdev)
 
        return 0;
 
-free_dma:
-       dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, rga->cmdbuf_virt,
-                      rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
 rel_m2m:
        v4l2_m2m_release(rga->m2m_dev);
 rel_vdev:
@@ -759,9 +768,6 @@ static void rga_remove(struct platform_device *pdev)
 {
        struct rockchip_rga *rga = platform_get_drvdata(pdev);
 
-       dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, rga->cmdbuf_virt,
-                      rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
-
        v4l2_info(&rga->v4l2_dev, "Removing\n");
 
        v4l2_m2m_release(rga->m2m_dev);

diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index 27b3c9b4f220cc974b326a58ca95fb8bf46b0064..04aeb7b429523fc84c0f581c6c891f38746f1524 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -53,6 +53,9 @@ struct rga_ctx {
        struct rga_frame out;
        struct v4l2_ctrl_handler ctrl_handler;
 
+       void *cmdbuf_virt;
+       dma_addr_t cmdbuf_phy;
+
        int osequence;
        int csequence;
 
@@ -89,8 +92,6 @@ struct rockchip_rga {
        spinlock_t ctrl_lock;
 
        struct rga_ctx *curr;
-       dma_addr_t cmdbuf_phy;
-       void *cmdbuf_virt;
 
        const struct rga_hw *hw;
 };