media: rockchip: rga: move hw specific parts to a dedicated struct

In preparation for the RGA3 unit, move RGA2 specific parts from rga.c
to rga-hw.c and create a struct to reference the RGA2 specific functions
and formats. This also allows to remove the rga-hw.h reference from the
include list of the rga driver.

Also document the command finish interrupt with a dedicated define.

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 ec6c17504ca156deee073c3e15f149128a4846a2..40498796507e015c44100373149782450e1995fe 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga-hw.c
@@ -437,8 +437,8 @@ static void rga_cmd_set(struct rga_ctx *ctx,
                PAGE_SIZE, DMA_BIDIRECTIONAL);
 }
 
-void rga_hw_start(struct rockchip_rga *rga,
-                 struct rga_vb_buffer *src, struct rga_vb_buffer *dst)
+static void rga_hw_start(struct rockchip_rga *rga,
+                        struct rga_vb_buffer *src,  struct rga_vb_buffer *dst)
 {
        struct rga_ctx *ctx = rga->curr;
 
@@ -452,3 +452,165 @@ void rga_hw_start(struct rockchip_rga *rga,
 
        rga_write(rga, RGA_CMD_CTRL, 0x1);
 }
+
+static bool rga_handle_irq(struct rockchip_rga *rga)
+{
+       int intr;
+
+       intr = rga_read(rga, RGA_INT) & 0xf;
+
+       rga_mod(rga, RGA_INT, intr << 4, 0xf << 4);
+
+       return intr & RGA_INT_COMMAND_FINISHED;
+}
+
+static void rga_get_version(struct rockchip_rga *rga)
+{
+       rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF;
+       rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;
+}
+
+static struct rga_fmt formats[] = {
+       {
+               .fourcc = V4L2_PIX_FMT_ARGB32,
+               .color_swap = RGA_COLOR_ALPHA_SWAP,
+               .hw_format = RGA_COLOR_FMT_ABGR8888,
+               .depth = 32,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_ABGR32,
+               .color_swap = RGA_COLOR_RB_SWAP,
+               .hw_format = RGA_COLOR_FMT_ABGR8888,
+               .depth = 32,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_XBGR32,
+               .color_swap = RGA_COLOR_RB_SWAP,
+               .hw_format = RGA_COLOR_FMT_XBGR8888,
+               .depth = 32,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_RGB24,
+               .color_swap = RGA_COLOR_NONE_SWAP,
+               .hw_format = RGA_COLOR_FMT_RGB888,
+               .depth = 24,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_BGR24,
+               .color_swap = RGA_COLOR_RB_SWAP,
+               .hw_format = RGA_COLOR_FMT_RGB888,
+               .depth = 24,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_ARGB444,
+               .color_swap = RGA_COLOR_RB_SWAP,
+               .hw_format = RGA_COLOR_FMT_ABGR4444,
+               .depth = 16,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_ARGB555,
+               .color_swap = RGA_COLOR_RB_SWAP,
+               .hw_format = RGA_COLOR_FMT_ABGR1555,
+               .depth = 16,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_RGB565,
+               .color_swap = RGA_COLOR_RB_SWAP,
+               .hw_format = RGA_COLOR_FMT_BGR565,
+               .depth = 16,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV21,
+               .color_swap = RGA_COLOR_UV_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV420SP,
+               .depth = 12,
+               .y_div = 2,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV61,
+               .color_swap = RGA_COLOR_UV_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV422SP,
+               .depth = 16,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV12,
+               .color_swap = RGA_COLOR_NONE_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV420SP,
+               .depth = 12,
+               .y_div = 2,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV12M,
+               .color_swap = RGA_COLOR_NONE_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV420SP,
+               .depth = 12,
+               .y_div = 2,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV16,
+               .color_swap = RGA_COLOR_NONE_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV422SP,
+               .depth = 16,
+               .y_div = 1,
+               .x_div = 1,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_YUV420,
+               .color_swap = RGA_COLOR_NONE_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV420P,
+               .depth = 12,
+               .y_div = 2,
+               .x_div = 2,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_YUV422P,
+               .color_swap = RGA_COLOR_NONE_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV422P,
+               .depth = 16,
+               .y_div = 1,
+               .x_div = 2,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_YVU420,
+               .color_swap = RGA_COLOR_UV_SWAP,
+               .hw_format = RGA_COLOR_FMT_YUV420P,
+               .depth = 12,
+               .y_div = 2,
+               .x_div = 2,
+       },
+};
+
+const struct rga_hw rga2_hw = {
+       .formats = formats,
+       .num_formats = ARRAY_SIZE(formats),
+       .cmdbuf_size = RGA_CMDBUF_SIZE,
+       .min_width = MIN_WIDTH,
+       .max_width = MAX_WIDTH,
+       .min_height = MIN_HEIGHT,
+       .max_height = MAX_HEIGHT,
+
+       .start = rga_hw_start,
+       .handle_irq = rga_handle_irq,
+       .get_version = rga_get_version,
+};

diff --git a/drivers/media/platform/rockchip/rga/rga-hw.h b/drivers/media/platform/rockchip/rga/rga-hw.h
index 2b8537a5fd0d7a17444485c61fa5caed91f07324..c2e34be751939931d13793de44127876b2e6782a 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga-hw.h
+++ b/drivers/media/platform/rockchip/rga/rga-hw.h
@@ -15,9 +15,6 @@
 #define MIN_WIDTH 34
 #define MIN_HEIGHT 34
 
-#define DEFAULT_WIDTH 100
-#define DEFAULT_HEIGHT 100
-
 #define RGA_TIMEOUT 500
 
 /* Registers address */
@@ -178,6 +175,8 @@
 #define RGA_ALPHA_COLOR_NORMAL 0
 #define RGA_ALPHA_COLOR_MULTIPLY_CAL 1
 
+#define RGA_INT_COMMAND_FINISHED 4
+
 /* Registers union */
 union rga_mode_ctrl {
        unsigned int val;

diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 8c34f73d69764e3f1c95f9ce5643aec5375b41c4..f599c992829dd7efd8c4a0be4463100b33810a69 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -25,7 +25,6 @@
 #include <media/videobuf2-dma-sg.h>
 #include <media/videobuf2-v4l2.h>
 
-#include "rga-hw.h"
 #include "rga.h"
 
 static int debug;
@@ -47,7 +46,7 @@ static void device_run(void *prv)
 
        dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
 
-       rga_hw_start(rga, vb_to_rga(src), vb_to_rga(dst));
+       rga->hw->start(rga, vb_to_rga(src), vb_to_rga(dst));
 
        spin_unlock_irqrestore(&rga->ctrl_lock, flags);
 }
@@ -55,13 +54,8 @@ static void device_run(void *prv)
 static irqreturn_t rga_isr(int irq, void *prv)
 {
        struct rockchip_rga *rga = prv;
-       int intr;
 
-       intr = rga_read(rga, RGA_INT) & 0xf;
-
-       rga_mod(rga, RGA_INT, intr << 4, 0xf << 4);
-
-       if (intr & 0x04) {
+       if (rga->hw->handle_irq(rga)) {
                struct vb2_v4l2_buffer *src, *dst;
                struct rga_ctx *ctx = rga->curr;
 
@@ -184,158 +178,17 @@ static int rga_setup_ctrls(struct rga_ctx *ctx)
        return 0;
 }
 
-static struct rga_fmt formats[] = {
-       {
-               .fourcc = V4L2_PIX_FMT_ARGB32,
-               .color_swap = RGA_COLOR_ALPHA_SWAP,
-               .hw_format = RGA_COLOR_FMT_ABGR8888,
-               .depth = 32,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_ABGR32,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_ABGR8888,
-               .depth = 32,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_XBGR32,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_XBGR8888,
-               .depth = 32,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_RGB24,
-               .color_swap = RGA_COLOR_NONE_SWAP,
-               .hw_format = RGA_COLOR_FMT_RGB888,
-               .depth = 24,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_BGR24,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_RGB888,
-               .depth = 24,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_ARGB444,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_ABGR4444,
-               .depth = 16,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_ARGB555,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_ABGR1555,
-               .depth = 16,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_RGB565,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_BGR565,
-               .depth = 16,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV21,
-               .color_swap = RGA_COLOR_UV_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV420SP,
-               .depth = 12,
-               .y_div = 2,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV61,
-               .color_swap = RGA_COLOR_UV_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV422SP,
-               .depth = 16,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV12,
-               .color_swap = RGA_COLOR_NONE_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV420SP,
-               .depth = 12,
-               .y_div = 2,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV12M,
-               .color_swap = RGA_COLOR_NONE_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV420SP,
-               .depth = 12,
-               .y_div = 2,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV16,
-               .color_swap = RGA_COLOR_NONE_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV422SP,
-               .depth = 16,
-               .y_div = 1,
-               .x_div = 1,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_YUV420,
-               .color_swap = RGA_COLOR_NONE_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV420P,
-               .depth = 12,
-               .y_div = 2,
-               .x_div = 2,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_YUV422P,
-               .color_swap = RGA_COLOR_NONE_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV422P,
-               .depth = 16,
-               .y_div = 1,
-               .x_div = 2,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_YVU420,
-               .color_swap = RGA_COLOR_UV_SWAP,
-               .hw_format = RGA_COLOR_FMT_YUV420P,
-               .depth = 12,
-               .y_div = 2,
-               .x_div = 2,
-       },
-};
-
-#define NUM_FORMATS ARRAY_SIZE(formats)
-
-static struct rga_fmt *rga_fmt_find(u32 pixelformat)
+static struct rga_fmt *rga_fmt_find(struct rockchip_rga *rga, u32 pixelformat)
 {
        unsigned int i;
 
-       for (i = 0; i < NUM_FORMATS; i++) {
-               if (formats[i].fourcc == pixelformat)
-                       return &formats[i];
+       for (i = 0; i < rga->hw->num_formats; i++) {
+               if (rga->hw->formats[i].fourcc == pixelformat)
+                       return &rga->hw->formats[i];
        }
        return NULL;
 }
 
-static struct rga_frame def_frame = {
-       .crop.left = 0,
-       .crop.top = 0,
-       .crop.width = DEFAULT_WIDTH,
-       .crop.height = DEFAULT_HEIGHT,
-       .fmt = &formats[0],
-};
-
 struct rga_frame *rga_get_frame(struct rga_ctx *ctx, enum v4l2_buf_type type)
 {
        if (V4L2_TYPE_IS_OUTPUT(type))
@@ -350,6 +203,18 @@ static int rga_open(struct file *file)
        struct rockchip_rga *rga = video_drvdata(file);
        struct rga_ctx *ctx = NULL;
        int ret = 0;
+       u32 def_width = clamp(DEFAULT_WIDTH, rga->hw->min_width, rga->hw->max_width);
+       u32 def_height = clamp(DEFAULT_HEIGHT, rga->hw->min_height, rga->hw->max_height);
+       struct rga_frame def_frame = {
+               .crop.left = 0,
+               .crop.top = 0,
+               .crop.width = def_width,
+               .crop.height = def_height,
+               .fmt = &rga->hw->formats[0],
+       };
+
+       def_frame.stride = (def_width * def_frame.fmt->depth) >> 3;
+       def_frame.size = def_frame.stride * def_height;
 
        ctx = kzalloc_obj(*ctx);
        if (!ctx)
@@ -360,9 +225,9 @@ static int rga_open(struct file *file)
        ctx->out = def_frame;
 
        v4l2_fill_pixfmt_mp(&ctx->in.pix,
-                           ctx->in.fmt->fourcc, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+                           ctx->in.fmt->fourcc, def_width, def_height);
        v4l2_fill_pixfmt_mp(&ctx->out.pix,
-                           ctx->out.fmt->fourcc, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+                           ctx->out.fmt->fourcc, def_width, def_height);
 
        if (mutex_lock_interruptible(&rga->mutex)) {
                kfree(ctx);
@@ -429,12 +294,13 @@ vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *cap)
 
 static int vidioc_enum_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f)
 {
+       struct rockchip_rga *rga = video_drvdata(file);
        struct rga_fmt *fmt;
 
-       if (f->index >= NUM_FORMATS)
+       if (f->index >= rga->hw->num_formats)
                return -EINVAL;
 
-       fmt = &formats[f->index];
+       fmt = &rga->hw->formats[f->index];
        f->pixelformat = fmt->fourcc;
 
        if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
@@ -469,6 +335,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
        struct v4l2_pix_format_mplane *pix_fmt = &f->fmt.pix_mp;
        struct rga_ctx *ctx = file_to_rga_ctx(file);
+       const struct rga_hw *hw = ctx->rga->hw;
        struct rga_fmt *fmt;
 
        if (V4L2_TYPE_IS_CAPTURE(f->type)) {
@@ -487,14 +354,14 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
                pix_fmt->xfer_func = frm->pix.xfer_func;
        }
 
-       fmt = rga_fmt_find(pix_fmt->pixelformat);
+       fmt = rga_fmt_find(ctx->rga, pix_fmt->pixelformat);
        if (!fmt)
-               fmt = &formats[0];
+               fmt = &hw->formats[0];
 
        pix_fmt->width = clamp(pix_fmt->width,
-                              (u32)MIN_WIDTH, (u32)MAX_WIDTH);
+                              hw->min_width, hw->max_width);
        pix_fmt->height = clamp(pix_fmt->height,
-                               (u32)MIN_HEIGHT, (u32)MAX_HEIGHT);
+                               hw->min_height, hw->max_height);
 
        v4l2_fill_pixfmt_mp(pix_fmt, fmt->fourcc, pix_fmt->width, pix_fmt->height);
        pix_fmt->field = V4L2_FIELD_NONE;
@@ -529,7 +396,7 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
        frm->size = 0;
        for (i = 0; i < pix_fmt->num_planes; i++)
                frm->size += pix_fmt->plane_fmt[i].sizeimage;
-       frm->fmt = rga_fmt_find(pix_fmt->pixelformat);
+       frm->fmt = rga_fmt_find(rga, pix_fmt->pixelformat);
        frm->stride = pix_fmt->plane_fmt[0].bytesperline;
 
        /*
@@ -660,7 +527,7 @@ static int vidioc_s_selection(struct file *file, void *priv,
 
        if (s->r.left + s->r.width > f->pix.width ||
            s->r.top + s->r.height > f->pix.height ||
-           s->r.width < MIN_WIDTH || s->r.height < MIN_HEIGHT) {
+           s->r.width < rga->hw->min_width || s->r.height < rga->hw->min_height) {
                v4l2_dbg(debug, 1, &rga->v4l2_dev, "unsupported crop value.\n");
                return -EINVAL;
        }
@@ -770,6 +637,10 @@ static int rga_probe(struct platform_device *pdev)
        if (!rga)
                return -ENOMEM;
 
+       rga->hw = of_device_get_match_data(&pdev->dev);
+       if (!rga->hw)
+               return dev_err_probe(&pdev->dev, -ENODEV, "failed to get match data\n");
+
        rga->dev = &pdev->dev;
        spin_lock_init(&rga->ctrl_lock);
        mutex_init(&rga->mutex);
@@ -833,8 +704,7 @@ static int rga_probe(struct platform_device *pdev)
        if (ret < 0)
                goto rel_m2m;
 
-       rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF;
-       rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;
+       rga->hw->get_version(rga);
 
        v4l2_info(&rga->v4l2_dev, "HW Version: 0x%02x.%02x\n",
                  rga->version.major, rga->version.minor);
@@ -842,7 +712,7 @@ 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_CMDBUF_SIZE,
+       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) {
@@ -850,9 +720,6 @@ static int rga_probe(struct platform_device *pdev)
                goto rel_m2m;
        }
 
-       def_frame.stride = (DEFAULT_WIDTH * def_frame.fmt->depth) >> 3;
-       def_frame.size = def_frame.stride * DEFAULT_HEIGHT;
-
        ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
        if (ret) {
                v4l2_err(&rga->v4l2_dev, "Failed to register video device\n");
@@ -865,7 +732,7 @@ static int rga_probe(struct platform_device *pdev)
        return 0;
 
 free_dma:
-       dma_free_attrs(rga->dev, RGA_CMDBUF_SIZE, rga->cmdbuf_virt,
+       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);
@@ -883,7 +750,7 @@ static void rga_remove(struct platform_device *pdev)
 {
        struct rockchip_rga *rga = platform_get_drvdata(pdev);
 
-       dma_free_attrs(rga->dev, RGA_CMDBUF_SIZE, rga->cmdbuf_virt,
+       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");
@@ -919,9 +786,11 @@ static const struct dev_pm_ops rga_pm = {
 static const struct of_device_id rockchip_rga_match[] = {
        {
                .compatible = "rockchip,rk3288-rga",
+               .data = &rga2_hw,
        },
        {
                .compatible = "rockchip,rk3399-rga",
+               .data = &rga2_hw,
        },
        {},
 };

diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index c4a3905a48f0d6ff054ec1c188835882f89b25d7..640e51028534117a0e0a5f20b689c26e7dd9b55b 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -14,6 +14,9 @@
 
 #define RGA_NAME "rockchip-rga"
 
+#define DEFAULT_WIDTH 100
+#define DEFAULT_HEIGHT 100
+
 struct rga_fmt {
        u32 fourcc;
        int depth;
@@ -68,6 +71,8 @@ static inline struct rga_ctx *file_to_rga_ctx(struct file *filp)
        return container_of(file_to_v4l2_fh(filp), struct rga_ctx, fh);
 }
 
+struct rga_hw;
+
 struct rockchip_rga {
        struct v4l2_device v4l2_dev;
        struct v4l2_m2m_dev *m2m_dev;
@@ -88,6 +93,8 @@ struct rockchip_rga {
        struct rga_ctx *curr;
        dma_addr_t cmdbuf_phy;
        void *cmdbuf_virt;
+
+       const struct rga_hw *hw;
 };
 
 struct rga_addr_offset {
@@ -138,7 +145,19 @@ static inline void rga_mod(struct rockchip_rga *rga, u32 reg, u32 val, u32 mask)
        rga_write(rga, reg, temp);
 };
 
-void rga_hw_start(struct rockchip_rga *rga,
-                 struct rga_vb_buffer *src, struct rga_vb_buffer *dst);
+struct rga_hw {
+       struct rga_fmt *formats;
+       u32 num_formats;
+       size_t cmdbuf_size;
+       u32 min_width, min_height;
+       u32 max_width, max_height;
+
+       void (*start)(struct rockchip_rga *rga,
+                     struct rga_vb_buffer *src, struct rga_vb_buffer *dst);
+       bool (*handle_irq)(struct rockchip_rga *rga);
+       void (*get_version)(struct rockchip_rga *rga);
+};
+
+extern const struct rga_hw rga2_hw;
 
 #endif