media: rockchip/vpu: rename from rockchip to hantro
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 12 Jun 2019 09:39:06 +0000 (05:39 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 12 Jun 2019 14:30:45 +0000 (10:30 -0400)
Rename the driver and all relevant identifiers from Rockchip to Hantro,
as other Hantro IP based VPU implementations can be supported by the
same driver.
The RK3288 decoder is Hantro G1 based, the encoder is Hantro H1.

This patch just renames, no functional changes.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
42 files changed:
MAINTAINERS
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
drivers/staging/media/hantro/Kconfig [new file with mode: 0644]
drivers/staging/media/hantro/Makefile [new file with mode: 0644]
drivers/staging/media/hantro/TODO [new file with mode: 0644]
drivers/staging/media/hantro/hantro.h [new file with mode: 0644]
drivers/staging/media/hantro/hantro_drv.c [new file with mode: 0644]
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c [new file with mode: 0644]
drivers/staging/media/hantro/hantro_g1_regs.h [new file with mode: 0644]
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c [new file with mode: 0644]
drivers/staging/media/hantro/hantro_h1_regs.h [new file with mode: 0644]
drivers/staging/media/hantro/hantro_hw.h [new file with mode: 0644]
drivers/staging/media/hantro/hantro_jpeg.c [new file with mode: 0644]
drivers/staging/media/hantro/hantro_jpeg.h [new file with mode: 0644]
drivers/staging/media/hantro/hantro_mpeg2.c [new file with mode: 0644]
drivers/staging/media/hantro/hantro_v4l2.c [new file with mode: 0644]
drivers/staging/media/hantro/hantro_v4l2.h [new file with mode: 0644]
drivers/staging/media/hantro/rk3288_vpu_hw.c [new file with mode: 0644]
drivers/staging/media/hantro/rk3399_vpu_hw.c [new file with mode: 0644]
drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c [new file with mode: 0644]
drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c [new file with mode: 0644]
drivers/staging/media/hantro/rk3399_vpu_regs.h [new file with mode: 0644]
drivers/staging/media/rockchip/vpu/Kconfig [deleted file]
drivers/staging/media/rockchip/vpu/Makefile [deleted file]
drivers/staging/media/rockchip/vpu/TODO [deleted file]
drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c [deleted file]
drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c [deleted file]
drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c [deleted file]
drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h [deleted file]
drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c [deleted file]
drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c [deleted file]
drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c [deleted file]
drivers/staging/media/rockchip/vpu/rk3399_vpu_regs.h [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu.h [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.c [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c [deleted file]
drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.h [deleted file]

index 6a3bac28ebb47830a84e1c50c23fecbe83dc1739..29cca8aabf19a4ff55f0a337de1a068515314a6e 100644 (file)
@@ -13512,11 +13512,11 @@ S:    Maintained
 F:     drivers/media/platform/rockchip/rga/
 F:     Documentation/devicetree/bindings/media/rockchip-rga.txt
 
-ROCKCHIP VPU CODEC DRIVER
+HANTRO VPU CODEC DRIVER
 M:     Ezequiel Garcia <ezequiel@collabora.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/media/platform/rockchip/vpu/
+F:     drivers/staging/media/platform/hantro/
 F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
 
 ROCKER DRIVER
index 7212762035b4dd3f78615a1d8be95a7ac1098d80..534d85d6c5e3d01b5ce7287b54662e29870df2fd 100644 (file)
@@ -26,14 +26,14 @@ source "drivers/staging/media/bcm2048/Kconfig"
 
 source "drivers/staging/media/davinci_vpfe/Kconfig"
 
+source "drivers/staging/media/hantro/Kconfig"
+
 source "drivers/staging/media/imx/Kconfig"
 
 source "drivers/staging/media/meson/vdec/Kconfig"
 
 source "drivers/staging/media/omap4iss/Kconfig"
 
-source "drivers/staging/media/rockchip/vpu/Kconfig"
-
 source "drivers/staging/media/sunxi/Kconfig"
 
 source "drivers/staging/media/tegra-vde/Kconfig"
index 4222584a9bcb6bf709f75261c7d3f18e7e3e6f65..c486298194da20b83bf9f67d57b5f0273d8b05be 100644 (file)
@@ -7,6 +7,6 @@ obj-$(CONFIG_VIDEO_MESON_VDEC)  += meson/vdec/
 obj-$(CONFIG_VIDEO_OMAP4)      += omap4iss/
 obj-$(CONFIG_VIDEO_SUNXI)      += sunxi/
 obj-$(CONFIG_TEGRA_VDE)                += tegra-vde/
-obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip/vpu/
+obj-$(CONFIG_VIDEO_HANTRO)     += hantro/
 obj-$(CONFIG_VIDEO_IPU3_IMGU)  += ipu3/
 obj-$(CONFIG_SOC_CAMERA)       += soc_camera/
diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig
new file mode 100644 (file)
index 0000000..be133bb
--- /dev/null
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0
+config VIDEO_HANTRO
+       tristate "Hantro VPU driver"
+       depends on ARCH_ROCKCHIP || COMPILE_TEST
+       depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER
+       depends on MEDIA_CONTROLLER_REQUEST_API
+       select VIDEOBUF2_DMA_CONTIG
+       select VIDEOBUF2_VMALLOC
+       select V4L2_MEM2MEM_DEV
+       help
+         Support for the Hantro IP based Video Processing Unit present on
+         Rockchip SoC, which accelerates video and image encoding and
+         decoding.
+         To compile this driver as a module, choose M here: the module
+         will be called hantro-vpu.
+
+config VIDEO_HANTRO_ROCKCHIP
+       bool "Hantro VPU Rockchip support"
+       depends on VIDEO_HANTRO
+       depends on ARCH_ROCKCHIP || COMPILE_TEST
+       default y
+       help
+         Enable support for RK3288 and RK3399 SoCs.
diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile
new file mode 100644 (file)
index 0000000..1584acd
--- /dev/null
@@ -0,0 +1,15 @@
+obj-$(CONFIG_VIDEO_HANTRO) += hantro-vpu.o
+
+hantro-vpu-y += \
+               hantro_drv.o \
+               hantro_v4l2.o \
+               hantro_h1_jpeg_enc.o \
+               hantro_g1_mpeg2_dec.o \
+               rk3399_vpu_hw_jpeg_enc.o \
+               rk3399_vpu_hw_mpeg2_dec.o \
+               hantro_jpeg.o \
+               hantro_mpeg2.o
+
+hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \
+               rk3288_vpu_hw.o \
+               rk3399_vpu_hw.o
diff --git a/drivers/staging/media/hantro/TODO b/drivers/staging/media/hantro/TODO
new file mode 100644 (file)
index 0000000..fa0c940
--- /dev/null
@@ -0,0 +1,13 @@
+* Support for VP8, VP9 and H264 is planned for this driver.
+
+  Given the V4L controls for those CODECs will be part of
+  the uABI, it will be required to have the driver in staging.
+
+  For this reason, we are keeping this driver in staging for now.
+
+* Add support for the S_SELECTION API.
+  See the comment for VEPU_REG_ENC_OVER_FILL_STRM_OFFSET.
+
+* Instead of having a DMA bounce buffer, it could be possible to use a
+  normal buffer and memmove() the payload to make space for the header.
+  This might need to use extra JPEG markers for padding reasons.
diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h
new file mode 100644 (file)
index 0000000..14e6854
--- /dev/null
@@ -0,0 +1,334 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ *
+ * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.
+ */
+
+#ifndef HANTRO_H_
+#define HANTRO_H_
+
+#include <linux/platform_device.h>
+#include <linux/videodev2.h>
+#include <linux/wait.h>
+#include <linux/clk.h>
+
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
+
+#include "hantro_hw.h"
+
+#define HANTRO_MAX_CLOCKS              4
+
+#define MPEG2_MB_DIM                   16
+#define MPEG2_MB_WIDTH(w)              DIV_ROUND_UP(w, MPEG2_MB_DIM)
+#define MPEG2_MB_HEIGHT(h)             DIV_ROUND_UP(h, MPEG2_MB_DIM)
+
+#define JPEG_MB_DIM                    16
+#define JPEG_MB_WIDTH(w)               DIV_ROUND_UP(w, JPEG_MB_DIM)
+#define JPEG_MB_HEIGHT(h)              DIV_ROUND_UP(h, JPEG_MB_DIM)
+
+struct hantro_ctx;
+struct hantro_codec_ops;
+
+#define HANTRO_JPEG_ENCODER    BIT(0)
+#define HANTRO_ENCODERS                0x0000ffff
+
+#define HANTRO_MPEG2_DECODER   BIT(16)
+#define HANTRO_DECODERS                0xffff0000
+
+/**
+ * struct hantro_variant - information about VPU hardware variant
+ *
+ * @enc_offset:                        Offset from VPU base to encoder registers.
+ * @dec_offset:                        Offset from VPU base to decoder registers.
+ * @enc_fmts:                  Encoder formats.
+ * @num_enc_fmts:              Number of encoder formats.
+ * @dec_fmts:                  Decoder formats.
+ * @num_dec_fmts:              Number of decoder formats.
+ * @codec:                     Supported codecs
+ * @codec_ops:                 Codec ops.
+ * @init:                      Initialize hardware.
+ * @vepu_irq:                  encoder interrupt handler
+ * @vdpu_irq:                  decoder interrupt handler
+ * @clk_names:                 array of clock names
+ * @num_clocks:                        number of clocks in the array
+ */
+struct hantro_variant {
+       unsigned int enc_offset;
+       unsigned int dec_offset;
+       const struct hantro_fmt *enc_fmts;
+       unsigned int num_enc_fmts;
+       const struct hantro_fmt *dec_fmts;
+       unsigned int num_dec_fmts;
+       unsigned int codec;
+       const struct hantro_codec_ops *codec_ops;
+       int (*init)(struct hantro_dev *vpu);
+       irqreturn_t (*vepu_irq)(int irq, void *priv);
+       irqreturn_t (*vdpu_irq)(int irq, void *priv);
+       const char *clk_names[HANTRO_MAX_CLOCKS];
+       int num_clocks;
+};
+
+/**
+ * enum hantro_codec_mode - codec operating mode.
+ * @HANTRO_MODE_NONE:  No operating mode. Used for RAW video formats.
+ * @HANTRO_MODE_JPEG_ENC: JPEG encoder.
+ * @HANTRO_MODE_MPEG2_DEC: MPEG-2 decoder.
+ */
+enum hantro_codec_mode {
+       HANTRO_MODE_NONE = -1,
+       HANTRO_MODE_JPEG_ENC,
+       HANTRO_MODE_MPEG2_DEC,
+};
+
+/*
+ * struct hantro_ctrl - helper type to declare supported controls
+ * @id:                V4L2 control ID (V4L2_CID_xxx)
+ * @codec:     codec id this control belong to (HANTRO_JPEG_ENCODER, etc.)
+ * @cfg:       control configuration
+ */
+struct hantro_ctrl {
+       unsigned int id;
+       unsigned int codec;
+       struct v4l2_ctrl_config cfg;
+};
+
+/*
+ * struct hantro_func - Hantro VPU functionality
+ *
+ * @id:                        processing functionality ID (can be
+ *                     %MEDIA_ENT_F_PROC_VIDEO_ENCODER or
+ *                     %MEDIA_ENT_F_PROC_VIDEO_DECODER)
+ * @vdev:              &struct video_device that exposes the encoder or
+ *                     decoder functionality
+ * @source_pad:                &struct media_pad with the source pad.
+ * @sink:              &struct media_entity pointer with the sink entity
+ * @sink_pad:          &struct media_pad with the sink pad.
+ * @proc:              &struct media_entity pointer with the M2M device itself.
+ * @proc_pads:         &struct media_pad with the @proc pads.
+ * @intf_devnode:      &struct media_intf devnode pointer with the interface
+ *                     with controls the M2M device.
+ *
+ * Contains everything needed to attach the video device to the media device.
+ */
+struct hantro_func {
+       unsigned int id;
+       struct video_device vdev;
+       struct media_pad source_pad;
+       struct media_entity sink;
+       struct media_pad sink_pad;
+       struct media_entity proc;
+       struct media_pad proc_pads[2];
+       struct media_intf_devnode *intf_devnode;
+};
+
+static inline struct hantro_func *
+hantro_vdev_to_func(struct video_device *vdev)
+{
+       return container_of(vdev, struct hantro_func, vdev);
+}
+
+/**
+ * struct hantro_dev - driver data
+ * @v4l2_dev:          V4L2 device to register video devices for.
+ * @m2m_dev:           mem2mem device associated to this device.
+ * @mdev:              media device associated to this device.
+ * @encoder:           encoder functionality.
+ * @decoder:           decoder functionality.
+ * @pdev:              Pointer to VPU platform device.
+ * @dev:               Pointer to device for convenient logging using
+ *                     dev_ macros.
+ * @clocks:            Array of clock handles.
+ * @base:              Mapped address of VPU registers.
+ * @enc_base:          Mapped address of VPU encoder register for convenience.
+ * @dec_base:          Mapped address of VPU decoder register for convenience.
+ * @vpu_mutex:         Mutex to synchronize V4L2 calls.
+ * @irqlock:           Spinlock to synchronize access to data structures
+ *                     shared with interrupt handlers.
+ * @variant:           Hardware variant-specific parameters.
+ * @watchdog_work:     Delayed work for hardware timeout handling.
+ */
+struct hantro_dev {
+       struct v4l2_device v4l2_dev;
+       struct v4l2_m2m_dev *m2m_dev;
+       struct media_device mdev;
+       struct hantro_func *encoder;
+       struct hantro_func *decoder;
+       struct platform_device *pdev;
+       struct device *dev;
+       struct clk_bulk_data clocks[HANTRO_MAX_CLOCKS];
+       void __iomem *base;
+       void __iomem *enc_base;
+       void __iomem *dec_base;
+
+       struct mutex vpu_mutex; /* video_device lock */
+       spinlock_t irqlock;
+       const struct hantro_variant *variant;
+       struct delayed_work watchdog_work;
+};
+
+/**
+ * struct hantro_ctx - Context (instance) private data.
+ *
+ * @dev:               VPU driver data to which the context belongs.
+ * @fh:                        V4L2 file handler.
+ *
+ * @sequence_cap:       Sequence counter for capture queue
+ * @sequence_out:       Sequence counter for output queue
+ *
+ * @vpu_src_fmt:       Descriptor of active source format.
+ * @src_fmt:           V4L2 pixel format of active source format.
+ * @vpu_dst_fmt:       Descriptor of active destination format.
+ * @dst_fmt:           V4L2 pixel format of active destination format.
+ *
+ * @ctrl_handler:      Control handler used to register controls.
+ * @jpeg_quality:      User-specified JPEG compression quality.
+ *
+ * @buf_finish:                Buffer finish. This depends on encoder or decoder
+ *                     context, and it's called right before
+ *                     calling v4l2_m2m_job_finish.
+ * @codec_ops:         Set of operations related to codec mode.
+ * @jpeg_enc:          JPEG-encoding context.
+ * @mpeg2_dec:         MPEG-2-decoding context.
+ */
+struct hantro_ctx {
+       struct hantro_dev *dev;
+       struct v4l2_fh fh;
+
+       u32 sequence_cap;
+       u32 sequence_out;
+
+       const struct hantro_fmt *vpu_src_fmt;
+       struct v4l2_pix_format_mplane src_fmt;
+       const struct hantro_fmt *vpu_dst_fmt;
+       struct v4l2_pix_format_mplane dst_fmt;
+
+       struct v4l2_ctrl_handler ctrl_handler;
+       int jpeg_quality;
+
+       int (*buf_finish)(struct hantro_ctx *ctx,
+                         struct vb2_buffer *buf,
+                         unsigned int bytesused);
+
+       const struct hantro_codec_ops *codec_ops;
+
+       /* Specific for particular codec modes. */
+       union {
+               struct hantro_jpeg_enc_hw_ctx jpeg_enc;
+               struct hantro_mpeg2_dec_hw_ctx mpeg2_dec;
+       };
+};
+
+/**
+ * struct hantro_fmt - information about supported video formats.
+ * @name:      Human readable name of the format.
+ * @fourcc:    FourCC code of the format. See V4L2_PIX_FMT_*.
+ * @codec_mode:        Codec mode related to this format. See
+ *             enum hantro_codec_mode.
+ * @header_size: Optional header size. Currently used by JPEG encoder.
+ * @max_depth: Maximum depth, for bitstream formats
+ * @enc_fmt:   Format identifier for encoder registers.
+ * @frmsize:   Supported range of frame sizes (only for bitstream formats).
+ */
+struct hantro_fmt {
+       char *name;
+       u32 fourcc;
+       enum hantro_codec_mode codec_mode;
+       int header_size;
+       int max_depth;
+       enum hantro_enc_fmt enc_fmt;
+       struct v4l2_frmsize_stepwise frmsize;
+};
+
+/* Logging helpers */
+
+/**
+ * debug - Module parameter to control level of debugging messages.
+ *
+ * Level of debugging messages can be controlled by bits of
+ * module parameter called "debug". Meaning of particular
+ * bits is as follows:
+ *
+ * bit 0 - global information: mode, size, init, release
+ * bit 1 - each run start/result information
+ * bit 2 - contents of small controls from userspace
+ * bit 3 - contents of big controls from userspace
+ * bit 4 - detail fmt, ctrl, buffer q/dq information
+ * bit 5 - detail function enter/leave trace information
+ * bit 6 - register write/read information
+ */
+extern int hantro_debug;
+
+#define vpu_debug(level, fmt, args...)                         \
+       do {                                                    \
+               if (hantro_debug & BIT(level))          \
+                       pr_info("%s:%d: " fmt,                  \
+                                __func__, __LINE__, ##args);   \
+       } while (0)
+
+#define vpu_err(fmt, args...)                                  \
+       pr_err("%s:%d: " fmt, __func__, __LINE__, ##args)
+
+/* Structure access helpers. */
+static inline struct hantro_ctx *fh_to_ctx(struct v4l2_fh *fh)
+{
+       return container_of(fh, struct hantro_ctx, fh);
+}
+
+/* Register accessors. */
+static inline void vepu_write_relaxed(struct hantro_dev *vpu,
+                                     u32 val, u32 reg)
+{
+       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
+       writel_relaxed(val, vpu->enc_base + reg);
+}
+
+static inline void vepu_write(struct hantro_dev *vpu, u32 val, u32 reg)
+{
+       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
+       writel(val, vpu->enc_base + reg);
+}
+
+static inline u32 vepu_read(struct hantro_dev *vpu, u32 reg)
+{
+       u32 val = readl(vpu->enc_base + reg);
+
+       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
+       return val;
+}
+
+static inline void vdpu_write_relaxed(struct hantro_dev *vpu,
+                                     u32 val, u32 reg)
+{
+       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
+       writel_relaxed(val, vpu->dec_base + reg);
+}
+
+static inline void vdpu_write(struct hantro_dev *vpu, u32 val, u32 reg)
+{
+       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
+       writel(val, vpu->dec_base + reg);
+}
+
+static inline u32 vdpu_read(struct hantro_dev *vpu, u32 reg)
+{
+       u32 val = readl(vpu->dec_base + reg);
+
+       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
+       return val;
+}
+
+bool hantro_is_encoder_ctx(const struct hantro_ctx *ctx);
+
+void *hantro_get_ctrl(struct hantro_ctx *ctx, u32 id);
+dma_addr_t hantro_get_ref(struct vb2_queue *q, u64 ts);
+
+#endif /* HANTRO_H_ */
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
new file mode 100644 (file)
index 0000000..d325f63
--- /dev/null
@@ -0,0 +1,854 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Collabora, Ltd.
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ *
+ * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.
+ */
+
+#include <linux/clk.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/videodev2.h>
+#include <linux/workqueue.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-vmalloc.h>
+
+#include "hantro_v4l2.h"
+#include "hantro.h"
+#include "hantro_hw.h"
+
+#define DRIVER_NAME "hantro-vpu"
+
+int hantro_debug;
+module_param_named(debug, hantro_debug, int, 0644);
+MODULE_PARM_DESC(debug,
+                "Debug level - higher value produces more verbose messages");
+
+void *hantro_get_ctrl(struct hantro_ctx *ctx, u32 id)
+{
+       struct v4l2_ctrl *ctrl;
+
+       ctrl = v4l2_ctrl_find(&ctx->ctrl_handler, id);
+       return ctrl ? ctrl->p_cur.p : NULL;
+}
+
+dma_addr_t hantro_get_ref(struct vb2_queue *q, u64 ts)
+{
+       int index;
+
+       index = vb2_find_timestamp(q, ts, 0);
+       if (index >= 0)
+               return vb2_dma_contig_plane_dma_addr(q->bufs[index], 0);
+       return 0;
+}
+
+static int
+hantro_enc_buf_finish(struct hantro_ctx *ctx, struct vb2_buffer *buf,
+                     unsigned int bytesused)
+{
+       size_t avail_size;
+
+       avail_size = vb2_plane_size(buf, 0) - ctx->vpu_dst_fmt->header_size;
+       if (bytesused > avail_size)
+               return -EINVAL;
+       /*
+        * The bounce buffer is only for the JPEG encoder.
+        * TODO: Rework the JPEG encoder to eliminate the need
+        * for a bounce buffer.
+        */
+       if (ctx->jpeg_enc.bounce_buffer.cpu) {
+               memcpy(vb2_plane_vaddr(buf, 0) +
+                      ctx->vpu_dst_fmt->header_size,
+                      ctx->jpeg_enc.bounce_buffer.cpu, bytesused);
+       }
+       buf->planes[0].bytesused =
+               ctx->vpu_dst_fmt->header_size + bytesused;
+       return 0;
+}
+
+static int
+hantro_dec_buf_finish(struct hantro_ctx *ctx, struct vb2_buffer *buf,
+                     unsigned int bytesused)
+{
+       /* For decoders set bytesused as per the output picture. */
+       buf->planes[0].bytesused = ctx->dst_fmt.plane_fmt[0].sizeimage;
+       return 0;
+}
+
+static void hantro_job_finish(struct hantro_dev *vpu,
+                             struct hantro_ctx *ctx,
+                             unsigned int bytesused,
+                             enum vb2_buffer_state result)
+{
+       struct vb2_v4l2_buffer *src, *dst;
+       int ret;
+
+       pm_runtime_mark_last_busy(vpu->dev);
+       pm_runtime_put_autosuspend(vpu->dev);
+       clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks);
+
+       src = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+       dst = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+
+       if (WARN_ON(!src))
+               return;
+       if (WARN_ON(!dst))
+               return;
+
+       src->sequence = ctx->sequence_out++;
+       dst->sequence = ctx->sequence_cap++;
+
+       v4l2_m2m_buf_copy_metadata(src, dst, true);
+
+       ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
+       if (ret)
+               result = VB2_BUF_STATE_ERROR;
+
+       v4l2_m2m_buf_done(src, result);
+       v4l2_m2m_buf_done(dst, result);
+
+       v4l2_m2m_job_finish(vpu->m2m_dev, ctx->fh.m2m_ctx);
+}
+
+void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused,
+                    enum vb2_buffer_state result)
+{
+       struct hantro_ctx *ctx =
+               v4l2_m2m_get_curr_priv(vpu->m2m_dev);
+
+       /*
+        * If cancel_delayed_work returns false
+        * the timeout expired. The watchdog is running,
+        * and will take care of finishing the job.
+        */
+       if (cancel_delayed_work(&vpu->watchdog_work))
+               hantro_job_finish(vpu, ctx, bytesused, result);
+}
+
+void hantro_watchdog(struct work_struct *work)
+{
+       struct hantro_dev *vpu;
+       struct hantro_ctx *ctx;
+
+       vpu = container_of(to_delayed_work(work),
+                          struct hantro_dev, watchdog_work);
+       ctx = v4l2_m2m_get_curr_priv(vpu->m2m_dev);
+       if (ctx) {
+               vpu_err("frame processing timed out!\n");
+               ctx->codec_ops->reset(ctx);
+               hantro_job_finish(vpu, ctx, 0, VB2_BUF_STATE_ERROR);
+       }
+}
+
+static void device_run(void *priv)
+{
+       struct hantro_ctx *ctx = priv;
+       int ret;
+
+       ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
+       if (ret)
+               goto err_cancel_job;
+       ret = pm_runtime_get_sync(ctx->dev->dev);
+       if (ret < 0)
+               goto err_cancel_job;
+
+       ctx->codec_ops->run(ctx);
+       return;
+
+err_cancel_job:
+       hantro_job_finish(ctx->dev, ctx, 0, VB2_BUF_STATE_ERROR);
+}
+
+bool hantro_is_encoder_ctx(const struct hantro_ctx *ctx)
+{
+       return ctx->buf_finish == hantro_enc_buf_finish;
+}
+
+static struct v4l2_m2m_ops vpu_m2m_ops = {
+       .device_run = device_run,
+};
+
+static int
+queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
+{
+       struct hantro_ctx *ctx = priv;
+       int ret;
+
+       src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+       src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+       src_vq->drv_priv = ctx;
+       src_vq->ops = &hantro_queue_ops;
+       src_vq->mem_ops = &vb2_dma_contig_memops;
+
+       /*
+        * Driver does mostly sequential access, so sacrifice TLB efficiency
+        * for faster allocation. Also, no CPU access on the source queue,
+        * so no kernel mapping needed.
+        */
+       src_vq->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES |
+                           DMA_ATTR_NO_KERNEL_MAPPING;
+       src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+       src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+       src_vq->lock = &ctx->dev->vpu_mutex;
+       src_vq->dev = ctx->dev->v4l2_dev.dev;
+       src_vq->supports_requests = true;
+
+       ret = vb2_queue_init(src_vq);
+       if (ret)
+               return ret;
+
+       /*
+        * When encoding, the CAPTURE queue doesn't need dma memory,
+        * as the CPU needs to create the JPEG frames, from the
+        * hardware-produced JPEG payload.
+        *
+        * For the DMA destination buffer, we use a bounce buffer.
+        */
+       if (hantro_is_encoder_ctx(ctx)) {
+               dst_vq->mem_ops = &vb2_vmalloc_memops;
+       } else {
+               dst_vq->bidirectional = true;
+               dst_vq->mem_ops = &vb2_dma_contig_memops;
+               dst_vq->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES |
+                                   DMA_ATTR_NO_KERNEL_MAPPING;
+       }
+
+       dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+       dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+       dst_vq->drv_priv = ctx;
+       dst_vq->ops = &hantro_queue_ops;
+       dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+       dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+       dst_vq->lock = &ctx->dev->vpu_mutex;
+       dst_vq->dev = ctx->dev->v4l2_dev.dev;
+
+       return vb2_queue_init(dst_vq);
+}
+
+static int hantro_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+       struct hantro_ctx *ctx;
+
+       ctx = container_of(ctrl->handler,
+                          struct hantro_ctx, ctrl_handler);
+
+       vpu_debug(1, "s_ctrl: id = %d, val = %d\n", ctrl->id, ctrl->val);
+
+       switch (ctrl->id) {
+       case V4L2_CID_JPEG_COMPRESSION_QUALITY:
+               ctx->jpeg_quality = ctrl->val;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static const struct v4l2_ctrl_ops hantro_ctrl_ops = {
+       .s_ctrl = hantro_s_ctrl,
+};
+
+static struct hantro_ctrl controls[] = {
+       {
+               .id = V4L2_CID_JPEG_COMPRESSION_QUALITY,
+               .codec = HANTRO_JPEG_ENCODER,
+               .cfg = {
+                       .min = 5,
+                       .max = 100,
+                       .step = 1,
+                       .def = 50,
+               },
+       }, {
+               .id = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
+               .codec = HANTRO_MPEG2_DECODER,
+               .cfg = {
+                       .elem_size = sizeof(struct v4l2_ctrl_mpeg2_slice_params),
+               },
+       }, {
+               .id = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
+               .codec = HANTRO_MPEG2_DECODER,
+               .cfg = {
+                       .elem_size = sizeof(struct v4l2_ctrl_mpeg2_quantization),
+               },
+       },
+};
+
+static int hantro_ctrls_setup(struct hantro_dev *vpu,
+                             struct hantro_ctx *ctx,
+                             int allowed_codecs)
+{
+       int i, num_ctrls = ARRAY_SIZE(controls);
+
+       v4l2_ctrl_handler_init(&ctx->ctrl_handler, num_ctrls);
+
+       for (i = 0; i < num_ctrls; i++) {
+               if (!(allowed_codecs & controls[i].codec))
+                       continue;
+               if (!controls[i].cfg.elem_size) {
+                       v4l2_ctrl_new_std(&ctx->ctrl_handler,
+                                         &hantro_ctrl_ops,
+                                         controls[i].id, controls[i].cfg.min,
+                                         controls[i].cfg.max,
+                                         controls[i].cfg.step,
+                                         controls[i].cfg.def);
+               } else {
+                       controls[i].cfg.id = controls[i].id;
+                       v4l2_ctrl_new_custom(&ctx->ctrl_handler,
+                                            &controls[i].cfg, NULL);
+               }
+
+               if (ctx->ctrl_handler.error) {
+                       vpu_err("Adding control (%d) failed %d\n",
+                               controls[i].id,
+                               ctx->ctrl_handler.error);
+                       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
+                       return ctx->ctrl_handler.error;
+               }
+       }
+       return v4l2_ctrl_handler_setup(&ctx->ctrl_handler);
+}
+
+/*
+ * V4L2 file operations.
+ */
+
+static int hantro_open(struct file *filp)
+{
+       struct hantro_dev *vpu = video_drvdata(filp);
+       struct video_device *vdev = video_devdata(filp);
+       struct hantro_func *func = hantro_vdev_to_func(vdev);
+       struct hantro_ctx *ctx;
+       int allowed_codecs, ret;
+
+       /*
+        * We do not need any extra locking here, because we operate only
+        * on local data here, except reading few fields from dev, which
+        * do not change through device's lifetime (which is guaranteed by
+        * reference on module from open()) and V4L2 internal objects (such
+        * as vdev and ctx->fh), which have proper locking done in respective
+        * helper functions used here.
+        */
+
+       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+       if (!ctx)
+               return -ENOMEM;
+
+       ctx->dev = vpu;
+       if (func->id == MEDIA_ENT_F_PROC_VIDEO_ENCODER) {
+               allowed_codecs = vpu->variant->codec & HANTRO_ENCODERS;
+               ctx->buf_finish = hantro_enc_buf_finish;
+               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(vpu->m2m_dev, ctx,
+                                                   queue_init);
+       } else if (func->id == MEDIA_ENT_F_PROC_VIDEO_DECODER) {
+               allowed_codecs = vpu->variant->codec & HANTRO_DECODERS;
+               ctx->buf_finish = hantro_dec_buf_finish;
+               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(vpu->m2m_dev, ctx,
+                                                   queue_init);
+       } else {
+               ctx->fh.m2m_ctx = ERR_PTR(-ENODEV);
+       }
+       if (IS_ERR(ctx->fh.m2m_ctx)) {
+               ret = PTR_ERR(ctx->fh.m2m_ctx);
+               kfree(ctx);
+               return ret;
+       }
+
+       v4l2_fh_init(&ctx->fh, vdev);
+       filp->private_data = &ctx->fh;
+       v4l2_fh_add(&ctx->fh);
+
+       hantro_reset_fmts(ctx);
+
+       ret = hantro_ctrls_setup(vpu, ctx, allowed_codecs);
+       if (ret) {
+               vpu_err("Failed to set up controls\n");
+               goto err_fh_free;
+       }
+       ctx->fh.ctrl_handler = &ctx->ctrl_handler;
+
+       return 0;
+
+err_fh_free:
+       v4l2_fh_del(&ctx->fh);
+       v4l2_fh_exit(&ctx->fh);
+       kfree(ctx);
+       return ret;
+}
+
+static int hantro_release(struct file *filp)
+{
+       struct hantro_ctx *ctx =
+               container_of(filp->private_data, struct hantro_ctx, fh);
+
+       /*
+        * No need for extra locking because this was the last reference
+        * to this file.
+        */
+       v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
+       v4l2_fh_del(&ctx->fh);
+       v4l2_fh_exit(&ctx->fh);
+       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
+       kfree(ctx);
+
+       return 0;
+}
+
+static const struct v4l2_file_operations hantro_fops = {
+       .owner = THIS_MODULE,
+       .open = hantro_open,
+       .release = hantro_release,
+       .poll = v4l2_m2m_fop_poll,
+       .unlocked_ioctl = video_ioctl2,
+       .mmap = v4l2_m2m_fop_mmap,
+};
+
+static const struct of_device_id of_hantro_match[] = {
+#ifdef CONFIG_VIDEO_HANTRO_ROCKCHIP
+       { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
+       { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, },
+#endif
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, of_hantro_match);
+
+static int hantro_register_entity(struct media_device *mdev,
+                                 struct media_entity *entity,
+                                 const char *entity_name,
+                                 struct media_pad *pads, int num_pads,
+                                 int function, struct video_device *vdev)
+{
+       char *name;
+       int ret;
+
+       entity->obj_type = MEDIA_ENTITY_TYPE_BASE;
+       if (function == MEDIA_ENT_F_IO_V4L) {
+               entity->info.dev.major = VIDEO_MAJOR;
+               entity->info.dev.minor = vdev->minor;
+       }
+
+       name = devm_kasprintf(mdev->dev, GFP_KERNEL, "%s-%s", vdev->name,
+                             entity_name);
+       if (!name)
+               return -ENOMEM;
+
+       entity->name = name;
+       entity->function = function;
+
+       ret = media_entity_pads_init(entity, num_pads, pads);
+       if (ret)
+               return ret;
+
+       ret = media_device_register_entity(mdev, entity);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static int hantro_attach_func(struct hantro_dev *vpu,
+                             struct hantro_func *func)
+{
+       struct media_device *mdev = &vpu->mdev;
+       struct media_link *link;
+       int ret;
+
+       /* Create the three encoder entities with their pads */
+       func->source_pad.flags = MEDIA_PAD_FL_SOURCE;
+       ret = hantro_register_entity(mdev, &func->vdev.entity, "source",
+                                    &func->source_pad, 1, MEDIA_ENT_F_IO_V4L,
+                                    &func->vdev);
+       if (ret)
+               return ret;
+
+       func->proc_pads[0].flags = MEDIA_PAD_FL_SINK;
+       func->proc_pads[1].flags = MEDIA_PAD_FL_SOURCE;
+       ret = hantro_register_entity(mdev, &func->proc, "proc",
+                                    func->proc_pads, 2, func->id,
+                                    &func->vdev);
+       if (ret)
+               goto err_rel_entity0;
+
+       func->sink_pad.flags = MEDIA_PAD_FL_SINK;
+       ret = hantro_register_entity(mdev, &func->sink, "sink",
+                                    &func->sink_pad, 1, MEDIA_ENT_F_IO_V4L,
+                                    &func->vdev);
+       if (ret)
+               goto err_rel_entity1;
+
+       /* Connect the three entities */
+       ret = media_create_pad_link(&func->vdev.entity, 0, &func->proc, 1,
+                                   MEDIA_LNK_FL_IMMUTABLE |
+                                   MEDIA_LNK_FL_ENABLED);
+       if (ret)
+               goto err_rel_entity2;
+
+       ret = media_create_pad_link(&func->proc, 0, &func->sink, 0,
+                                   MEDIA_LNK_FL_IMMUTABLE |
+                                   MEDIA_LNK_FL_ENABLED);
+       if (ret)
+               goto err_rm_links0;
+
+       /* Create video interface */
+       func->intf_devnode = media_devnode_create(mdev, MEDIA_INTF_T_V4L_VIDEO,
+                                                 0, VIDEO_MAJOR,
+                                                 func->vdev.minor);
+       if (!func->intf_devnode) {
+               ret = -ENOMEM;
+               goto err_rm_links1;
+       }
+
+       /* Connect the two DMA engines to the interface */
+       link = media_create_intf_link(&func->vdev.entity,
+                                     &func->intf_devnode->intf,
+                                     MEDIA_LNK_FL_IMMUTABLE |
+                                     MEDIA_LNK_FL_ENABLED);
+       if (!link) {
+               ret = -ENOMEM;
+               goto err_rm_devnode;
+       }
+
+       link = media_create_intf_link(&func->sink, &func->intf_devnode->intf,
+                                     MEDIA_LNK_FL_IMMUTABLE |
+                                     MEDIA_LNK_FL_ENABLED);
+       if (!link) {
+               ret = -ENOMEM;
+               goto err_rm_devnode;
+       }
+       return 0;
+
+err_rm_devnode:
+       media_devnode_remove(func->intf_devnode);
+
+err_rm_links1:
+       media_entity_remove_links(&func->sink);
+
+err_rm_links0:
+       media_entity_remove_links(&func->proc);
+       media_entity_remove_links(&func->vdev.entity);
+
+err_rel_entity2:
+       media_device_unregister_entity(&func->sink);
+
+err_rel_entity1:
+       media_device_unregister_entity(&func->proc);
+
+err_rel_entity0:
+       media_device_unregister_entity(&func->vdev.entity);
+       return ret;
+}
+
+static void hantro_detach_func(struct hantro_func *func)
+{
+       media_devnode_remove(func->intf_devnode);
+       media_entity_remove_links(&func->sink);
+       media_entity_remove_links(&func->proc);
+       media_entity_remove_links(&func->vdev.entity);
+       media_device_unregister_entity(&func->sink);
+       media_device_unregister_entity(&func->proc);
+       media_device_unregister_entity(&func->vdev.entity);
+}
+
+static int hantro_add_func(struct hantro_dev *vpu, unsigned int funcid)
+{
+       const struct of_device_id *match;
+       struct hantro_func *func;
+       struct video_device *vfd;
+       int ret;
+
+       match = of_match_node(of_hantro_match, vpu->dev->of_node);
+       func = devm_kzalloc(vpu->dev, sizeof(*func), GFP_KERNEL);
+       if (!func) {
+               v4l2_err(&vpu->v4l2_dev, "Failed to allocate video device\n");
+               return -ENOMEM;
+       }
+
+       func->id = funcid;
+
+       vfd = &func->vdev;
+       vfd->fops = &hantro_fops;
+       vfd->release = video_device_release_empty;
+       vfd->lock = &vpu->vpu_mutex;
+       vfd->v4l2_dev = &vpu->v4l2_dev;
+       vfd->vfl_dir = VFL_DIR_M2M;
+       vfd->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M_MPLANE;
+       vfd->ioctl_ops = &hantro_ioctl_ops;
+       snprintf(vfd->name, sizeof(vfd->name), "%s-%s", match->compatible,
+                funcid == MEDIA_ENT_F_PROC_VIDEO_ENCODER ? "enc" : "dec");
+
+       if (funcid == MEDIA_ENT_F_PROC_VIDEO_ENCODER)
+               vpu->encoder = func;
+       else
+               vpu->decoder = func;
+
+       video_set_drvdata(vfd, vpu);
+
+       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+       if (ret) {
+               v4l2_err(&vpu->v4l2_dev, "Failed to register video device\n");
+               return ret;
+       }
+
+       ret = hantro_attach_func(vpu, func);
+       if (ret) {
+               v4l2_err(&vpu->v4l2_dev,
+                        "Failed to attach functionality to the media device\n");
+               goto err_unreg_dev;
+       }
+
+       v4l2_info(&vpu->v4l2_dev, "registered as /dev/video%d\n", vfd->num);
+
+       return 0;
+
+err_unreg_dev:
+       video_unregister_device(vfd);
+       return ret;
+}
+
+static int hantro_add_enc_func(struct hantro_dev *vpu)
+{
+       if (!vpu->variant->enc_fmts)
+               return 0;
+
+       return hantro_add_func(vpu, MEDIA_ENT_F_PROC_VIDEO_ENCODER);
+}
+
+static int hantro_add_dec_func(struct hantro_dev *vpu)
+{
+       if (!vpu->variant->dec_fmts)
+               return 0;
+
+       return hantro_add_func(vpu, MEDIA_ENT_F_PROC_VIDEO_DECODER);
+}
+
+static void hantro_remove_func(struct hantro_dev *vpu,
+                              unsigned int funcid)
+{
+       struct hantro_func *func;
+
+       if (funcid == MEDIA_ENT_F_PROC_VIDEO_ENCODER)
+               func = vpu->encoder;
+       else
+               func = vpu->decoder;
+
+       if (!func)
+               return;
+
+       hantro_detach_func(func);
+       video_unregister_device(&func->vdev);
+}
+
+static void hantro_remove_enc_func(struct hantro_dev *vpu)
+{
+       hantro_remove_func(vpu, MEDIA_ENT_F_PROC_VIDEO_ENCODER);
+}
+
+static void hantro_remove_dec_func(struct hantro_dev *vpu)
+{
+       hantro_remove_func(vpu, MEDIA_ENT_F_PROC_VIDEO_DECODER);
+}
+
+static const struct media_device_ops hantro_m2m_media_ops = {
+       .req_validate = vb2_request_validate,
+       .req_queue = v4l2_m2m_request_queue,
+};
+
+static int hantro_probe(struct platform_device *pdev)
+{
+       const struct of_device_id *match;
+       struct hantro_dev *vpu;
+       struct resource *res;
+       int i, ret;
+
+       vpu = devm_kzalloc(&pdev->dev, sizeof(*vpu), GFP_KERNEL);
+       if (!vpu)
+               return -ENOMEM;
+
+       vpu->dev = &pdev->dev;
+       vpu->pdev = pdev;
+       mutex_init(&vpu->vpu_mutex);
+       spin_lock_init(&vpu->irqlock);
+
+       match = of_match_node(of_hantro_match, pdev->dev.of_node);
+       vpu->variant = match->data;
+
+       INIT_DELAYED_WORK(&vpu->watchdog_work, hantro_watchdog);
+
+       for (i = 0; i < vpu->variant->num_clocks; i++)
+               vpu->clocks[i].id = vpu->variant->clk_names[i];
+       ret = devm_clk_bulk_get(&pdev->dev, vpu->variant->num_clocks,
+                               vpu->clocks);
+       if (ret)
+               return ret;
+
+       res = platform_get_resource(vpu->pdev, IORESOURCE_MEM, 0);
+       vpu->base = devm_ioremap_resource(vpu->dev, res);
+       if (IS_ERR(vpu->base))
+               return PTR_ERR(vpu->base);
+       vpu->enc_base = vpu->base + vpu->variant->enc_offset;
+       vpu->dec_base = vpu->base + vpu->variant->dec_offset;
+
+       ret = dma_set_coherent_mask(vpu->dev, DMA_BIT_MASK(32));
+       if (ret) {
+               dev_err(vpu->dev, "Could not set DMA coherent mask.\n");
+               return ret;
+       }
+
+       if (vpu->variant->vdpu_irq) {
+               int irq;
+
+               irq = platform_get_irq_byname(vpu->pdev, "vdpu");
+               if (irq <= 0) {
+                       dev_err(vpu->dev, "Could not get vdpu IRQ.\n");
+                       return -ENXIO;
+               }
+
+               ret = devm_request_irq(vpu->dev, irq, vpu->variant->vdpu_irq,
+                                      0, dev_name(vpu->dev), vpu);
+               if (ret) {
+                       dev_err(vpu->dev, "Could not request vdpu IRQ.\n");
+                       return ret;
+               }
+       }
+
+       if (vpu->variant->vepu_irq) {
+               int irq;
+
+               irq = platform_get_irq_byname(vpu->pdev, "vepu");
+               if (irq <= 0) {
+                       dev_err(vpu->dev, "Could not get vepu IRQ.\n");
+                       return -ENXIO;
+               }
+
+               ret = devm_request_irq(vpu->dev, irq, vpu->variant->vepu_irq,
+                                      0, dev_name(vpu->dev), vpu);
+               if (ret) {
+                       dev_err(vpu->dev, "Could not request vepu IRQ.\n");
+                       return ret;
+               }
+       }
+
+       ret = vpu->variant->init(vpu);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to init VPU hardware\n");
+               return ret;
+       }
+
+       pm_runtime_set_autosuspend_delay(vpu->dev, 100);
+       pm_runtime_use_autosuspend(vpu->dev);
+       pm_runtime_enable(vpu->dev);
+
+       ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to prepare clocks\n");
+               return ret;
+       }
+
+       ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to register v4l2 device\n");
+               goto err_clk_unprepare;
+       }
+       platform_set_drvdata(pdev, vpu);
+
+       vpu->m2m_dev = v4l2_m2m_init(&vpu_m2m_ops);
+       if (IS_ERR(vpu->m2m_dev)) {
+               v4l2_err(&vpu->v4l2_dev, "Failed to init mem2mem device\n");
+               ret = PTR_ERR(vpu->m2m_dev);
+               goto err_v4l2_unreg;
+       }
+
+       vpu->mdev.dev = vpu->dev;
+       strscpy(vpu->mdev.model, DRIVER_NAME, sizeof(vpu->mdev.model));
+       strscpy(vpu->mdev.bus_info, "platform: " DRIVER_NAME,
+               sizeof(vpu->mdev.model));
+       media_device_init(&vpu->mdev);
+       vpu->mdev.ops = &hantro_m2m_media_ops;
+       vpu->v4l2_dev.mdev = &vpu->mdev;
+
+       ret = hantro_add_enc_func(vpu);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to register encoder\n");
+               goto err_m2m_rel;
+       }
+
+       ret = hantro_add_dec_func(vpu);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to register decoder\n");
+               goto err_rm_enc_func;
+       }
+
+       ret = media_device_register(&vpu->mdev);
+       if (ret) {
+               v4l2_err(&vpu->v4l2_dev, "Failed to register mem2mem media device\n");
+               goto err_rm_dec_func;
+       }
+
+       return 0;
+
+err_rm_dec_func:
+       hantro_remove_dec_func(vpu);
+err_rm_enc_func:
+       hantro_remove_enc_func(vpu);
+err_m2m_rel:
+       media_device_cleanup(&vpu->mdev);
+       v4l2_m2m_release(vpu->m2m_dev);
+err_v4l2_unreg:
+       v4l2_device_unregister(&vpu->v4l2_dev);
+err_clk_unprepare:
+       clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
+       pm_runtime_dont_use_autosuspend(vpu->dev);
+       pm_runtime_disable(vpu->dev);
+       return ret;
+}
+
+static int hantro_remove(struct platform_device *pdev)
+{
+       struct hantro_dev *vpu = platform_get_drvdata(pdev);
+
+       v4l2_info(&vpu->v4l2_dev, "Removing %s\n", pdev->name);
+
+       media_device_unregister(&vpu->mdev);
+       hantro_remove_dec_func(vpu);
+       hantro_remove_enc_func(vpu);
+       media_device_cleanup(&vpu->mdev);
+       v4l2_m2m_release(vpu->m2m_dev);
+       v4l2_device_unregister(&vpu->v4l2_dev);
+       clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
+       pm_runtime_dont_use_autosuspend(vpu->dev);
+       pm_runtime_disable(vpu->dev);
+       return 0;
+}
+
+static const struct dev_pm_ops hantro_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+                               pm_runtime_force_resume)
+};
+
+static struct platform_driver hantro_driver = {
+       .probe = hantro_probe,
+       .remove = hantro_remove,
+       .driver = {
+                  .name = DRIVER_NAME,
+                  .of_match_table = of_match_ptr(of_hantro_match),
+                  .pm = &hantro_pm_ops,
+       },
+};
+module_platform_driver(hantro_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Alpha Lin <Alpha.Lin@Rock-Chips.com>");
+MODULE_AUTHOR("Tomasz Figa <tfiga@chromium.org>");
+MODULE_AUTHOR("Ezequiel Garcia <ezequiel@collabora.com>");
+MODULE_DESCRIPTION("Hantro VPU codec driver");
diff --git a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
new file mode 100644 (file)
index 0000000..e592c1b
--- /dev/null
@@ -0,0 +1,260 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ */
+
+#include <asm/unaligned.h>
+#include <linux/bitfield.h>
+#include <media/v4l2-mem2mem.h>
+#include "hantro.h"
+#include "hantro_hw.h"
+
+#define G1_SWREG(nr)                   ((nr) * 4)
+
+#define G1_REG_RLC_VLC_BASE            G1_SWREG(12)
+#define G1_REG_DEC_OUT_BASE            G1_SWREG(13)
+#define G1_REG_REFER0_BASE             G1_SWREG(14)
+#define G1_REG_REFER1_BASE             G1_SWREG(15)
+#define G1_REG_REFER2_BASE             G1_SWREG(16)
+#define G1_REG_REFER3_BASE             G1_SWREG(17)
+#define G1_REG_QTABLE_BASE             G1_SWREG(40)
+#define G1_REG_DEC_E(v)                        ((v) ? BIT(0) : 0)
+
+#define G1_REG_DEC_AXI_RD_ID(v)                (((v) << 24) & GENMASK(31, 24))
+#define G1_REG_DEC_TIMEOUT_E(v)                ((v) ? BIT(23) : 0)
+#define G1_REG_DEC_STRSWAP32_E(v)      ((v) ? BIT(22) : 0)
+#define G1_REG_DEC_STRENDIAN_E(v)      ((v) ? BIT(21) : 0)
+#define G1_REG_DEC_INSWAP32_E(v)       ((v) ? BIT(20) : 0)
+#define G1_REG_DEC_OUTSWAP32_E(v)      ((v) ? BIT(19) : 0)
+#define G1_REG_DEC_DATA_DISC_E(v)      ((v) ? BIT(18) : 0)
+#define G1_REG_DEC_LATENCY(v)          (((v) << 11) & GENMASK(16, 11))
+#define G1_REG_DEC_CLK_GATE_E(v)       ((v) ? BIT(10) : 0)
+#define G1_REG_DEC_IN_ENDIAN(v)                ((v) ? BIT(9) : 0)
+#define G1_REG_DEC_OUT_ENDIAN(v)       ((v) ? BIT(8) : 0)
+#define G1_REG_DEC_ADV_PRE_DIS(v)      ((v) ? BIT(6) : 0)
+#define G1_REG_DEC_SCMD_DIS(v)         ((v) ? BIT(5) : 0)
+#define G1_REG_DEC_MAX_BURST(v)                (((v) << 0) & GENMASK(4, 0))
+
+#define G1_REG_DEC_MODE(v)             (((v) << 28) & GENMASK(31, 28))
+#define G1_REG_RLC_MODE_E(v)           ((v) ? BIT(27) : 0)
+#define G1_REG_PIC_INTERLACE_E(v)      ((v) ? BIT(23) : 0)
+#define G1_REG_PIC_FIELDMODE_E(v)      ((v) ? BIT(22) : 0)
+#define G1_REG_PIC_B_E(v)              ((v) ? BIT(21) : 0)
+#define G1_REG_PIC_INTER_E(v)          ((v) ? BIT(20) : 0)
+#define G1_REG_PIC_TOPFIELD_E(v)       ((v) ? BIT(19) : 0)
+#define G1_REG_FWD_INTERLACE_E(v)      ((v) ? BIT(18) : 0)
+#define G1_REG_FILTERING_DIS(v)                ((v) ? BIT(14) : 0)
+#define G1_REG_WRITE_MVS_E(v)          ((v) ? BIT(12) : 0)
+#define G1_REG_DEC_AXI_WR_ID(v)                (((v) << 0) & GENMASK(7, 0))
+
+#define G1_REG_PIC_MB_WIDTH(v)         (((v) << 23) & GENMASK(31, 23))
+#define G1_REG_PIC_MB_HEIGHT_P(v)      (((v) << 11) & GENMASK(18, 11))
+#define G1_REG_ALT_SCAN_E(v)           ((v) ? BIT(6) : 0)
+#define G1_REG_TOPFIELDFIRST_E(v)      ((v) ? BIT(5) : 0)
+
+#define G1_REG_STRM_START_BIT(v)       (((v) << 26) & GENMASK(31, 26))
+#define G1_REG_QSCALE_TYPE(v)          ((v) ? BIT(24) : 0)
+#define G1_REG_CON_MV_E(v)             ((v) ? BIT(4) : 0)
+#define G1_REG_INTRA_DC_PREC(v)                (((v) << 2) & GENMASK(3, 2))
+#define G1_REG_INTRA_VLC_TAB(v)                ((v) ? BIT(1) : 0)
+#define G1_REG_FRAME_PRED_DCT(v)       ((v) ? BIT(0) : 0)
+
+#define G1_REG_INIT_QP(v)              (((v) << 25) & GENMASK(30, 25))
+#define G1_REG_STREAM_LEN(v)           (((v) << 0) & GENMASK(23, 0))
+
+#define G1_REG_ALT_SCAN_FLAG_E(v)      ((v) ? BIT(19) : 0)
+#define G1_REG_FCODE_FWD_HOR(v)                (((v) << 15) & GENMASK(18, 15))
+#define G1_REG_FCODE_FWD_VER(v)                (((v) << 11) & GENMASK(14, 11))
+#define G1_REG_FCODE_BWD_HOR(v)                (((v) << 7) & GENMASK(10, 7))
+#define G1_REG_FCODE_BWD_VER(v)                (((v) << 3) & GENMASK(6, 3))
+#define G1_REG_MV_ACCURACY_FWD(v)      ((v) ? BIT(2) : 0)
+#define G1_REG_MV_ACCURACY_BWD(v)      ((v) ? BIT(1) : 0)
+
+#define G1_REG_STARTMB_X(v)            (((v) << 23) & GENMASK(31, 23))
+#define G1_REG_STARTMB_Y(v)            (((v) << 15) & GENMASK(22, 15))
+
+#define G1_REG_APF_THRESHOLD(v)                (((v) << 0) & GENMASK(13, 0))
+
+#define PICT_TOP_FIELD     1
+#define PICT_BOTTOM_FIELD  2
+#define PICT_FRAME         3
+
+static void
+hantro_g1_mpeg2_dec_set_quantization(struct hantro_dev *vpu,
+                                    struct hantro_ctx *ctx)
+{
+       struct v4l2_ctrl_mpeg2_quantization *quantization;
+
+       quantization = hantro_get_ctrl(ctx,
+                                      V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION);
+       hantro_mpeg2_dec_copy_qtable(ctx->mpeg2_dec.qtable.cpu,
+                                    quantization);
+       vdpu_write_relaxed(vpu, ctx->mpeg2_dec.qtable.dma,
+                          G1_REG_QTABLE_BASE);
+}
+
+static void
+hantro_g1_mpeg2_dec_set_buffers(struct hantro_dev *vpu, struct hantro_ctx *ctx,
+                               struct vb2_buffer *src_buf,
+                               struct vb2_buffer *dst_buf,
+                               const struct v4l2_mpeg2_sequence *sequence,
+                               const struct v4l2_mpeg2_picture *picture,
+                               const struct v4l2_ctrl_mpeg2_slice_params *slice_params)
+{
+       dma_addr_t forward_addr = 0, backward_addr = 0;
+       dma_addr_t current_addr, addr;
+       struct vb2_queue *vq;
+
+       vq = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);
+
+       switch (picture->picture_coding_type) {
+       case V4L2_MPEG2_PICTURE_CODING_TYPE_B:
+               backward_addr = hantro_get_ref(vq,
+                                              slice_params->backward_ref_ts);
+               /* fall-through */
+       case V4L2_MPEG2_PICTURE_CODING_TYPE_P:
+               forward_addr = hantro_get_ref(vq,
+                                             slice_params->forward_ref_ts);
+       }
+
+       /* Source bitstream buffer */
+       addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+       vdpu_write_relaxed(vpu, addr, G1_REG_RLC_VLC_BASE);
+
+       /* Destination frame buffer */
+       addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+       current_addr = addr;
+
+       if (picture->picture_structure == PICT_BOTTOM_FIELD)
+               addr += ALIGN(ctx->dst_fmt.width, 16);
+       vdpu_write_relaxed(vpu, addr, G1_REG_DEC_OUT_BASE);
+
+       if (!forward_addr)
+               forward_addr = current_addr;
+       if (!backward_addr)
+               backward_addr = current_addr;
+
+       /* Set forward ref frame (top/bottom field) */
+       if (picture->picture_structure == PICT_FRAME ||
+           picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B ||
+           (picture->picture_structure == PICT_TOP_FIELD &&
+            picture->top_field_first) ||
+           (picture->picture_structure == PICT_BOTTOM_FIELD &&
+            !picture->top_field_first)) {
+               vdpu_write_relaxed(vpu, forward_addr, G1_REG_REFER0_BASE);
+               vdpu_write_relaxed(vpu, forward_addr, G1_REG_REFER1_BASE);
+       } else if (picture->picture_structure == PICT_TOP_FIELD) {
+               vdpu_write_relaxed(vpu, forward_addr, G1_REG_REFER0_BASE);
+               vdpu_write_relaxed(vpu, current_addr, G1_REG_REFER1_BASE);
+       } else if (picture->picture_structure == PICT_BOTTOM_FIELD) {
+               vdpu_write_relaxed(vpu, current_addr, G1_REG_REFER0_BASE);
+               vdpu_write_relaxed(vpu, forward_addr, G1_REG_REFER1_BASE);
+       }
+
+       /* Set backward ref frame (top/bottom field) */
+       vdpu_write_relaxed(vpu, backward_addr, G1_REG_REFER2_BASE);
+       vdpu_write_relaxed(vpu, backward_addr, G1_REG_REFER3_BASE);
+}
+
+void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *src_buf, *dst_buf;
+       const struct v4l2_ctrl_mpeg2_slice_params *slice_params;
+       const struct v4l2_mpeg2_sequence *sequence;
+       const struct v4l2_mpeg2_picture *picture;
+       u32 reg;
+
+       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+
+       /* Apply request controls if any */
+       v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
+                               &ctx->ctrl_handler);
+
+       slice_params = hantro_get_ctrl(ctx,
+                                      V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS);
+       sequence = &slice_params->sequence;
+       picture = &slice_params->picture;
+
+       reg = G1_REG_DEC_AXI_RD_ID(0) |
+             G1_REG_DEC_TIMEOUT_E(1) |
+             G1_REG_DEC_STRSWAP32_E(1) |
+             G1_REG_DEC_STRENDIAN_E(1) |
+             G1_REG_DEC_INSWAP32_E(1) |
+             G1_REG_DEC_OUTSWAP32_E(1) |
+             G1_REG_DEC_DATA_DISC_E(0) |
+             G1_REG_DEC_LATENCY(0) |
+             G1_REG_DEC_CLK_GATE_E(1) |
+             G1_REG_DEC_IN_ENDIAN(1) |
+             G1_REG_DEC_OUT_ENDIAN(1) |
+             G1_REG_DEC_ADV_PRE_DIS(0) |
+             G1_REG_DEC_SCMD_DIS(0) |
+             G1_REG_DEC_MAX_BURST(16);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(2));
+
+       reg = G1_REG_DEC_MODE(5) |
+             G1_REG_RLC_MODE_E(0) |
+             G1_REG_PIC_INTERLACE_E(!sequence->progressive_sequence) |
+             G1_REG_PIC_FIELDMODE_E(picture->picture_structure != PICT_FRAME) |
+             G1_REG_PIC_B_E(picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B) |
+             G1_REG_PIC_INTER_E(picture->picture_coding_type != V4L2_MPEG2_PICTURE_CODING_TYPE_I) |
+             G1_REG_PIC_TOPFIELD_E(picture->picture_structure == PICT_TOP_FIELD) |
+             G1_REG_FWD_INTERLACE_E(0) |
+             G1_REG_FILTERING_DIS(1) |
+             G1_REG_WRITE_MVS_E(0) |
+             G1_REG_DEC_AXI_WR_ID(0);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(3));
+
+       reg = G1_REG_PIC_MB_WIDTH(MPEG2_MB_WIDTH(ctx->dst_fmt.width)) |
+             G1_REG_PIC_MB_HEIGHT_P(MPEG2_MB_HEIGHT(ctx->dst_fmt.height)) |
+             G1_REG_ALT_SCAN_E(picture->alternate_scan) |
+             G1_REG_TOPFIELDFIRST_E(picture->top_field_first);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(4));
+
+       reg = G1_REG_STRM_START_BIT(slice_params->data_bit_offset) |
+             G1_REG_QSCALE_TYPE(picture->q_scale_type) |
+             G1_REG_CON_MV_E(picture->concealment_motion_vectors) |
+             G1_REG_INTRA_DC_PREC(picture->intra_dc_precision) |
+             G1_REG_INTRA_VLC_TAB(picture->intra_vlc_format) |
+             G1_REG_FRAME_PRED_DCT(picture->frame_pred_frame_dct);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(5));
+
+       reg = G1_REG_INIT_QP(1) |
+             G1_REG_STREAM_LEN(slice_params->bit_size >> 3);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(6));
+
+       reg = G1_REG_ALT_SCAN_FLAG_E(picture->alternate_scan) |
+             G1_REG_FCODE_FWD_HOR(picture->f_code[0][0]) |
+             G1_REG_FCODE_FWD_VER(picture->f_code[0][1]) |
+             G1_REG_FCODE_BWD_HOR(picture->f_code[1][0]) |
+             G1_REG_FCODE_BWD_VER(picture->f_code[1][1]) |
+             G1_REG_MV_ACCURACY_FWD(1) |
+             G1_REG_MV_ACCURACY_BWD(1);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(18));
+
+       reg = G1_REG_STARTMB_X(0) |
+             G1_REG_STARTMB_Y(0);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(48));
+
+       reg = G1_REG_APF_THRESHOLD(8);
+       vdpu_write_relaxed(vpu, reg, G1_SWREG(55));
+
+       hantro_g1_mpeg2_dec_set_quantization(vpu, ctx);
+
+       hantro_g1_mpeg2_dec_set_buffers(vpu, ctx, &src_buf->vb2_buf,
+                                       &dst_buf->vb2_buf,
+                                       sequence, picture, slice_params);
+
+       /* Controls no longer in-use, we can complete them */
+       v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req,
+                                  &ctx->ctrl_handler);
+
+       /* Kick the watchdog and start decoding */
+       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
+
+       reg = G1_REG_DEC_E(1);
+       vdpu_write(vpu, reg, G1_SWREG(1));
+}
diff --git a/drivers/staging/media/hantro/hantro_g1_regs.h b/drivers/staging/media/hantro/hantro_g1_regs.h
new file mode 100644 (file)
index 0000000..5c0ea79
--- /dev/null
@@ -0,0 +1,301 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ */
+
+#ifndef HANTRO_G1_REGS_H_
+#define HANTRO_G1_REGS_H_
+
+/* Decoder registers. */
+#define G1_REG_INTERRUPT                               0x004
+#define     G1_REG_INTERRUPT_DEC_PIC_INF               BIT(24)
+#define     G1_REG_INTERRUPT_DEC_TIMEOUT               BIT(18)
+#define     G1_REG_INTERRUPT_DEC_SLICE_INT             BIT(17)
+#define     G1_REG_INTERRUPT_DEC_ERROR_INT             BIT(16)
+#define     G1_REG_INTERRUPT_DEC_ASO_INT               BIT(15)
+#define     G1_REG_INTERRUPT_DEC_BUFFER_INT            BIT(14)
+#define     G1_REG_INTERRUPT_DEC_BUS_INT               BIT(13)
+#define     G1_REG_INTERRUPT_DEC_RDY_INT               BIT(12)
+#define     G1_REG_INTERRUPT_DEC_IRQ                   BIT(8)
+#define     G1_REG_INTERRUPT_DEC_IRQ_DIS               BIT(4)
+#define     G1_REG_INTERRUPT_DEC_E                     BIT(0)
+#define G1_REG_CONFIG                                  0x008
+#define     G1_REG_CONFIG_DEC_AXI_RD_ID(x)             (((x) & 0xff) << 24)
+#define     G1_REG_CONFIG_DEC_TIMEOUT_E                        BIT(23)
+#define     G1_REG_CONFIG_DEC_STRSWAP32_E              BIT(22)
+#define     G1_REG_CONFIG_DEC_STRENDIAN_E              BIT(21)
+#define     G1_REG_CONFIG_DEC_INSWAP32_E               BIT(20)
+#define     G1_REG_CONFIG_DEC_OUTSWAP32_E              BIT(19)
+#define     G1_REG_CONFIG_DEC_DATA_DISC_E              BIT(18)
+#define     G1_REG_CONFIG_TILED_MODE_MSB               BIT(17)
+#define     G1_REG_CONFIG_DEC_OUT_TILED_E              BIT(17)
+#define     G1_REG_CONFIG_DEC_LATENCY(x)               (((x) & 0x3f) << 11)
+#define     G1_REG_CONFIG_DEC_CLK_GATE_E               BIT(10)
+#define     G1_REG_CONFIG_DEC_IN_ENDIAN                        BIT(9)
+#define     G1_REG_CONFIG_DEC_OUT_ENDIAN               BIT(8)
+#define     G1_REG_CONFIG_PRIORITY_MODE(x)             (((x) & 0x7) << 5)
+#define     G1_REG_CONFIG_TILED_MODE_LSB               BIT(7)
+#define     G1_REG_CONFIG_DEC_ADV_PRE_DIS              BIT(6)
+#define     G1_REG_CONFIG_DEC_SCMD_DIS                 BIT(5)
+#define     G1_REG_CONFIG_DEC_MAX_BURST(x)             (((x) & 0x1f) << 0)
+#define G1_REG_DEC_CTRL0                               0x00c
+#define     G1_REG_DEC_CTRL0_DEC_MODE(x)               (((x) & 0xf) << 28)
+#define     G1_REG_DEC_CTRL0_RLC_MODE_E                        BIT(27)
+#define     G1_REG_DEC_CTRL0_SKIP_MODE                 BIT(26)
+#define     G1_REG_DEC_CTRL0_DIVX3_E                   BIT(25)
+#define     G1_REG_DEC_CTRL0_PJPEG_E                   BIT(24)
+#define     G1_REG_DEC_CTRL0_PIC_INTERLACE_E           BIT(23)
+#define     G1_REG_DEC_CTRL0_PIC_FIELDMODE_E           BIT(22)
+#define     G1_REG_DEC_CTRL0_PIC_B_E                   BIT(21)
+#define     G1_REG_DEC_CTRL0_PIC_INTER_E               BIT(20)
+#define     G1_REG_DEC_CTRL0_PIC_TOPFIELD_E            BIT(19)
+#define     G1_REG_DEC_CTRL0_FWD_INTERLACE_E           BIT(18)
+#define     G1_REG_DEC_CTRL0_SORENSON_E                        BIT(17)
+#define     G1_REG_DEC_CTRL0_REF_TOPFIELD_E            BIT(16)
+#define     G1_REG_DEC_CTRL0_DEC_OUT_DIS               BIT(15)
+#define     G1_REG_DEC_CTRL0_FILTERING_DIS             BIT(14)
+#define     G1_REG_DEC_CTRL0_WEBP_E                    BIT(13)
+#define     G1_REG_DEC_CTRL0_MVC_E                     BIT(13)
+#define     G1_REG_DEC_CTRL0_PIC_FIXED_QUANT           BIT(13)
+#define     G1_REG_DEC_CTRL0_WRITE_MVS_E               BIT(12)
+#define     G1_REG_DEC_CTRL0_REFTOPFIRST_E             BIT(11)
+#define     G1_REG_DEC_CTRL0_SEQ_MBAFF_E               BIT(10)
+#define     G1_REG_DEC_CTRL0_PICORD_COUNT_E            BIT(9)
+#define     G1_REG_DEC_CTRL0_DEC_AHB_HLOCK_E           BIT(8)
+#define     G1_REG_DEC_CTRL0_DEC_AXI_WR_ID(x)          (((x) & 0xff) << 0)
+#define G1_REG_DEC_CTRL1                               0x010
+#define     G1_REG_DEC_CTRL1_PIC_MB_WIDTH(x)           (((x) & 0x1ff) << 23)
+#define     G1_REG_DEC_CTRL1_MB_WIDTH_OFF(x)           (((x) & 0xf) << 19)
+#define     G1_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(x)                (((x) & 0xff) << 11)
+#define     G1_REG_DEC_CTRL1_MB_HEIGHT_OFF(x)          (((x) & 0xf) << 7)
+#define     G1_REG_DEC_CTRL1_ALT_SCAN_E                        BIT(6)
+#define     G1_REG_DEC_CTRL1_TOPFIELDFIRST_E           BIT(5)
+#define     G1_REG_DEC_CTRL1_REF_FRAMES(x)             (((x) & 0x1f) << 0)
+#define     G1_REG_DEC_CTRL1_PIC_MB_W_EXT(x)           (((x) & 0x7) << 3)
+#define     G1_REG_DEC_CTRL1_PIC_MB_H_EXT(x)           (((x) & 0x7) << 0)
+#define     G1_REG_DEC_CTRL1_PIC_REFER_FLAG            BIT(0)
+#define G1_REG_DEC_CTRL2                               0x014
+#define     G1_REG_DEC_CTRL2_STRM_START_BIT(x)         (((x) & 0x3f) << 26)
+#define     G1_REG_DEC_CTRL2_SYNC_MARKER_E             BIT(25)
+#define     G1_REG_DEC_CTRL2_TYPE1_QUANT_E             BIT(24)
+#define     G1_REG_DEC_CTRL2_CH_QP_OFFSET(x)           (((x) & 0x1f) << 19)
+#define     G1_REG_DEC_CTRL2_CH_QP_OFFSET2(x)          (((x) & 0x1f) << 14)
+#define     G1_REG_DEC_CTRL2_FIELDPIC_FLAG_E           BIT(0)
+#define     G1_REG_DEC_CTRL2_INTRADC_VLC_THR(x)                (((x) & 0x7) << 16)
+#define     G1_REG_DEC_CTRL2_VOP_TIME_INCR(x)          (((x) & 0xffff) << 0)
+#define     G1_REG_DEC_CTRL2_DQ_PROFILE                        BIT(24)
+#define     G1_REG_DEC_CTRL2_DQBI_LEVEL                        BIT(23)
+#define     G1_REG_DEC_CTRL2_RANGE_RED_FRM_E           BIT(22)
+#define     G1_REG_DEC_CTRL2_FAST_UVMC_E               BIT(20)
+#define     G1_REG_DEC_CTRL2_TRANSDCTAB                        BIT(17)
+#define     G1_REG_DEC_CTRL2_TRANSACFRM(x)             (((x) & 0x3) << 15)
+#define     G1_REG_DEC_CTRL2_TRANSACFRM2(x)            (((x) & 0x3) << 13)
+#define     G1_REG_DEC_CTRL2_MB_MODE_TAB(x)            (((x) & 0x7) << 10)
+#define     G1_REG_DEC_CTRL2_MVTAB(x)                  (((x) & 0x7) << 7)
+#define     G1_REG_DEC_CTRL2_CBPTAB(x)                 (((x) & 0x7) << 4)
+#define     G1_REG_DEC_CTRL2_2MV_BLK_PAT_TAB(x)                (((x) & 0x3) << 2)
+#define     G1_REG_DEC_CTRL2_4MV_BLK_PAT_TAB(x)                (((x) & 0x3) << 0)
+#define     G1_REG_DEC_CTRL2_QSCALE_TYPE               BIT(24)
+#define     G1_REG_DEC_CTRL2_CON_MV_E                  BIT(4)
+#define     G1_REG_DEC_CTRL2_INTRA_DC_PREC(x)          (((x) & 0x3) << 2)
+#define     G1_REG_DEC_CTRL2_INTRA_VLC_TAB             BIT(1)
+#define     G1_REG_DEC_CTRL2_FRAME_PRED_DCT            BIT(0)
+#define     G1_REG_DEC_CTRL2_JPEG_QTABLES(x)           (((x) & 0x3) << 11)
+#define     G1_REG_DEC_CTRL2_JPEG_MODE(x)              (((x) & 0x7) << 8)
+#define     G1_REG_DEC_CTRL2_JPEG_FILRIGHT_E           BIT(7)
+#define     G1_REG_DEC_CTRL2_JPEG_STREAM_ALL           BIT(6)
+#define     G1_REG_DEC_CTRL2_CR_AC_VLCTABLE            BIT(5)
+#define     G1_REG_DEC_CTRL2_CB_AC_VLCTABLE            BIT(4)
+#define     G1_REG_DEC_CTRL2_CR_DC_VLCTABLE            BIT(3)
+#define     G1_REG_DEC_CTRL2_CB_DC_VLCTABLE            BIT(2)
+#define     G1_REG_DEC_CTRL2_CR_DC_VLCTABLE3           BIT(1)
+#define     G1_REG_DEC_CTRL2_CB_DC_VLCTABLE3           BIT(0)
+#define     G1_REG_DEC_CTRL2_STRM1_START_BIT(x)                (((x) & 0x3f) << 18)
+#define     G1_REG_DEC_CTRL2_HUFFMAN_E                 BIT(17)
+#define     G1_REG_DEC_CTRL2_MULTISTREAM_E             BIT(16)
+#define     G1_REG_DEC_CTRL2_BOOLEAN_VALUE(x)          (((x) & 0xff) << 8)
+#define     G1_REG_DEC_CTRL2_BOOLEAN_RANGE(x)          (((x) & 0xff) << 0)
+#define     G1_REG_DEC_CTRL2_ALPHA_OFFSET(x)           (((x) & 0x1f) << 5)
+#define     G1_REG_DEC_CTRL2_BETA_OFFSET(x)            (((x) & 0x1f) << 0)
+#define G1_REG_DEC_CTRL3                               0x018
+#define     G1_REG_DEC_CTRL3_START_CODE_E              BIT(31)
+#define     G1_REG_DEC_CTRL3_INIT_QP(x)                        (((x) & 0x3f) << 25)
+#define     G1_REG_DEC_CTRL3_CH_8PIX_ILEAV_E           BIT(24)
+#define     G1_REG_DEC_CTRL3_STREAM_LEN_EXT(x)         (((x) & 0xff) << 24)
+#define     G1_REG_DEC_CTRL3_STREAM_LEN(x)             (((x) & 0xffffff) << 0)
+#define G1_REG_DEC_CTRL4                               0x01c
+#define     G1_REG_DEC_CTRL4_CABAC_E                   BIT(31)
+#define     G1_REG_DEC_CTRL4_BLACKWHITE_E              BIT(30)
+#define     G1_REG_DEC_CTRL4_DIR_8X8_INFER_E           BIT(29)
+#define     G1_REG_DEC_CTRL4_WEIGHT_PRED_E             BIT(28)
+#define     G1_REG_DEC_CTRL4_WEIGHT_BIPR_IDC(x)                (((x) & 0x3) << 26)
+#define     G1_REG_DEC_CTRL4_AVS_H264_H_EXT            BIT(25)
+#define     G1_REG_DEC_CTRL4_FRAMENUM_LEN(x)           (((x) & 0x1f) << 16)
+#define     G1_REG_DEC_CTRL4_FRAMENUM(x)               (((x) & 0xffff) << 0)
+#define     G1_REG_DEC_CTRL4_BITPLANE0_E               BIT(31)
+#define     G1_REG_DEC_CTRL4_BITPLANE1_E               BIT(30)
+#define     G1_REG_DEC_CTRL4_BITPLANE2_E               BIT(29)
+#define     G1_REG_DEC_CTRL4_ALT_PQUANT(x)             (((x) & 0x1f) << 24)
+#define     G1_REG_DEC_CTRL4_DQ_EDGES(x)               (((x) & 0xf) << 20)
+#define     G1_REG_DEC_CTRL4_TTMBF                     BIT(19)
+#define     G1_REG_DEC_CTRL4_PQINDEX(x)                        (((x) & 0x1f) << 14)
+#define     G1_REG_DEC_CTRL4_VC1_HEIGHT_EXT            BIT(13)
+#define     G1_REG_DEC_CTRL4_BILIN_MC_E                        BIT(12)
+#define     G1_REG_DEC_CTRL4_UNIQP_E                   BIT(11)
+#define     G1_REG_DEC_CTRL4_HALFQP_E                  BIT(10)
+#define     G1_REG_DEC_CTRL4_TTFRM(x)                  (((x) & 0x3) << 8)
+#define     G1_REG_DEC_CTRL4_2ND_BYTE_EMUL_E           BIT(7)
+#define     G1_REG_DEC_CTRL4_DQUANT_E                  BIT(6)
+#define     G1_REG_DEC_CTRL4_VC1_ADV_E                 BIT(5)
+#define     G1_REG_DEC_CTRL4_PJPEG_FILDOWN_E           BIT(26)
+#define     G1_REG_DEC_CTRL4_PJPEG_WDIV8               BIT(25)
+#define     G1_REG_DEC_CTRL4_PJPEG_HDIV8               BIT(24)
+#define     G1_REG_DEC_CTRL4_PJPEG_AH(x)               (((x) & 0xf) << 20)
+#define     G1_REG_DEC_CTRL4_PJPEG_AL(x)               (((x) & 0xf) << 16)
+#define     G1_REG_DEC_CTRL4_PJPEG_SS(x)               (((x) & 0xff) << 8)
+#define     G1_REG_DEC_CTRL4_PJPEG_SE(x)               (((x) & 0xff) << 0)
+#define     G1_REG_DEC_CTRL4_DCT1_START_BIT(x)         (((x) & 0x3f) << 26)
+#define     G1_REG_DEC_CTRL4_DCT2_START_BIT(x)         (((x) & 0x3f) << 20)
+#define     G1_REG_DEC_CTRL4_CH_MV_RES                 BIT(13)
+#define     G1_REG_DEC_CTRL4_INIT_DC_MATCH0(x)         (((x) & 0x7) << 9)
+#define     G1_REG_DEC_CTRL4_INIT_DC_MATCH1(x)         (((x) & 0x7) << 6)
+#define     G1_REG_DEC_CTRL4_VP7_VERSION               BIT(5)
+#define G1_REG_DEC_CTRL5                               0x020
+#define     G1_REG_DEC_CTRL5_CONST_INTRA_E             BIT(31)
+#define     G1_REG_DEC_CTRL5_FILT_CTRL_PRES            BIT(30)
+#define     G1_REG_DEC_CTRL5_RDPIC_CNT_PRES            BIT(29)
+#define     G1_REG_DEC_CTRL5_8X8TRANS_FLAG_E           BIT(28)
+#define     G1_REG_DEC_CTRL5_REFPIC_MK_LEN(x)          (((x) & 0x7ff) << 17)
+#define     G1_REG_DEC_CTRL5_IDR_PIC_E                 BIT(16)
+#define     G1_REG_DEC_CTRL5_IDR_PIC_ID(x)             (((x) & 0xffff) << 0)
+#define     G1_REG_DEC_CTRL5_MV_SCALEFACTOR(x)         (((x) & 0xff) << 24)
+#define     G1_REG_DEC_CTRL5_REF_DIST_FWD(x)           (((x) & 0x1f) << 19)
+#define     G1_REG_DEC_CTRL5_REF_DIST_BWD(x)           (((x) & 0x1f) << 14)
+#define     G1_REG_DEC_CTRL5_LOOP_FILT_LIMIT(x)                (((x) & 0xf) << 14)
+#define     G1_REG_DEC_CTRL5_VARIANCE_TEST_E           BIT(13)
+#define     G1_REG_DEC_CTRL5_MV_THRESHOLD(x)           (((x) & 0x7) << 10)
+#define     G1_REG_DEC_CTRL5_VAR_THRESHOLD(x)          (((x) & 0x3ff) << 0)
+#define     G1_REG_DEC_CTRL5_DIVX_IDCT_E               BIT(8)
+#define     G1_REG_DEC_CTRL5_DIVX3_SLICE_SIZE(x)       (((x) & 0xff) << 0)
+#define     G1_REG_DEC_CTRL5_PJPEG_REST_FREQ(x)                (((x) & 0xffff) << 0)
+#define     G1_REG_DEC_CTRL5_RV_PROFILE(x)             (((x) & 0x3) << 30)
+#define     G1_REG_DEC_CTRL5_RV_OSV_QUANT(x)           (((x) & 0x3) << 28)
+#define     G1_REG_DEC_CTRL5_RV_FWD_SCALE(x)           (((x) & 0x3fff) << 14)
+#define     G1_REG_DEC_CTRL5_RV_BWD_SCALE(x)           (((x) & 0x3fff) << 0)
+#define     G1_REG_DEC_CTRL5_INIT_DC_COMP0(x)          (((x) & 0xffff) << 16)
+#define     G1_REG_DEC_CTRL5_INIT_DC_COMP1(x)          (((x) & 0xffff) << 0)
+#define G1_REG_DEC_CTRL6                               0x024
+#define     G1_REG_DEC_CTRL6_PPS_ID(x)                 (((x) & 0xff) << 24)
+#define     G1_REG_DEC_CTRL6_REFIDX1_ACTIVE(x)         (((x) & 0x1f) << 19)
+#define     G1_REG_DEC_CTRL6_REFIDX0_ACTIVE(x)         (((x) & 0x1f) << 14)
+#define     G1_REG_DEC_CTRL6_POC_LENGTH(x)             (((x) & 0xff) << 0)
+#define     G1_REG_DEC_CTRL6_ICOMP0_E                  BIT(24)
+#define     G1_REG_DEC_CTRL6_ISCALE0(x)                        (((x) & 0xff) << 16)
+#define     G1_REG_DEC_CTRL6_ISHIFT0(x)                        (((x) & 0xffff) << 0)
+#define     G1_REG_DEC_CTRL6_STREAM1_LEN(x)            (((x) & 0xffffff) << 0)
+#define     G1_REG_DEC_CTRL6_PIC_SLICE_AM(x)           (((x) & 0x1fff) << 0)
+#define     G1_REG_DEC_CTRL6_COEFFS_PART_AM(x)         (((x) & 0xf) << 24)
+#define G1_REG_FWD_PIC(i)                              (0x028 + ((i) * 0x4))
+#define     G1_REG_FWD_PIC_PINIT_RLIST_F5(x)           (((x) & 0x1f) << 25)
+#define     G1_REG_FWD_PIC_PINIT_RLIST_F4(x)           (((x) & 0x1f) << 20)
+#define     G1_REG_FWD_PIC_PINIT_RLIST_F3(x)           (((x) & 0x1f) << 15)
+#define     G1_REG_FWD_PIC_PINIT_RLIST_F2(x)           (((x) & 0x1f) << 10)
+#define     G1_REG_FWD_PIC_PINIT_RLIST_F1(x)           (((x) & 0x1f) << 5)
+#define     G1_REG_FWD_PIC_PINIT_RLIST_F0(x)           (((x) & 0x1f) << 0)
+#define     G1_REG_FWD_PIC1_ICOMP1_E                   BIT(24)
+#define     G1_REG_FWD_PIC1_ISCALE1(x)                 (((x) & 0xff) << 16)
+#define     G1_REG_FWD_PIC1_ISHIFT1(x)                 (((x) & 0xffff) << 0)
+#define     G1_REG_FWD_PIC1_SEGMENT_BASE(x)            ((x) << 0)
+#define     G1_REG_FWD_PIC1_SEGMENT_UPD_E              BIT(1)
+#define     G1_REG_FWD_PIC1_SEGMENT_E                  BIT(0)
+#define G1_REG_DEC_CTRL7                               0x02c
+#define     G1_REG_DEC_CTRL7_PINIT_RLIST_F15(x)                (((x) & 0x1f) << 25)
+#define     G1_REG_DEC_CTRL7_PINIT_RLIST_F14(x)                (((x) & 0x1f) << 20)
+#define     G1_REG_DEC_CTRL7_PINIT_RLIST_F13(x)                (((x) & 0x1f) << 15)
+#define     G1_REG_DEC_CTRL7_PINIT_RLIST_F12(x)                (((x) & 0x1f) << 10)
+#define     G1_REG_DEC_CTRL7_PINIT_RLIST_F11(x)                (((x) & 0x1f) << 5)
+#define     G1_REG_DEC_CTRL7_PINIT_RLIST_F10(x)                (((x) & 0x1f) << 0)
+#define     G1_REG_DEC_CTRL7_ICOMP2_E                  BIT(24)
+#define     G1_REG_DEC_CTRL7_ISCALE2(x)                        (((x) & 0xff) << 16)
+#define     G1_REG_DEC_CTRL7_ISHIFT2(x)                        (((x) & 0xffff) << 0)
+#define     G1_REG_DEC_CTRL7_DCT3_START_BIT(x)         (((x) & 0x3f) << 24)
+#define     G1_REG_DEC_CTRL7_DCT4_START_BIT(x)         (((x) & 0x3f) << 18)
+#define     G1_REG_DEC_CTRL7_DCT5_START_BIT(x)         (((x) & 0x3f) << 12)
+#define     G1_REG_DEC_CTRL7_DCT6_START_BIT(x)         (((x) & 0x3f) << 6)
+#define     G1_REG_DEC_CTRL7_DCT7_START_BIT(x)         (((x) & 0x3f) << 0)
+#define G1_REG_ADDR_STR                                        0x030
+#define G1_REG_ADDR_DST                                        0x034
+#define G1_REG_ADDR_REF(i)                             (0x038 + ((i) * 0x4))
+#define     G1_REG_ADDR_REF_FIELD_E                    BIT(1)
+#define     G1_REG_ADDR_REF_TOPC_E                     BIT(0)
+#define G1_REG_REF_PIC(i)                              (0x078 + ((i) * 0x4))
+#define     G1_REG_REF_PIC_FILT_TYPE_E                 BIT(31)
+#define     G1_REG_REF_PIC_FILT_SHARPNESS(x)           (((x) & 0x7) << 28)
+#define     G1_REG_REF_PIC_MB_ADJ_0(x)                 (((x) & 0x7f) << 21)
+#define     G1_REG_REF_PIC_MB_ADJ_1(x)                 (((x) & 0x7f) << 14)
+#define     G1_REG_REF_PIC_MB_ADJ_2(x)                 (((x) & 0x7f) << 7)
+#define     G1_REG_REF_PIC_MB_ADJ_3(x)                 (((x) & 0x7f) << 0)
+#define     G1_REG_REF_PIC_REFER1_NBR(x)               (((x) & 0xffff) << 16)
+#define     G1_REG_REF_PIC_REFER0_NBR(x)               (((x) & 0xffff) << 0)
+#define     G1_REG_REF_PIC_LF_LEVEL_0(x)               (((x) & 0x3f) << 18)
+#define     G1_REG_REF_PIC_LF_LEVEL_1(x)               (((x) & 0x3f) << 12)
+#define     G1_REG_REF_PIC_LF_LEVEL_2(x)               (((x) & 0x3f) << 6)
+#define     G1_REG_REF_PIC_LF_LEVEL_3(x)               (((x) & 0x3f) << 0)
+#define     G1_REG_REF_PIC_QUANT_DELTA_0(x)            (((x) & 0x1f) << 27)
+#define     G1_REG_REF_PIC_QUANT_DELTA_1(x)            (((x) & 0x1f) << 22)
+#define     G1_REG_REF_PIC_QUANT_0(x)                  (((x) & 0x7ff) << 11)
+#define     G1_REG_REF_PIC_QUANT_1(x)                  (((x) & 0x7ff) << 0)
+#define G1_REG_LT_REF                                  0x098
+#define G1_REG_VALID_REF                               0x09c
+#define G1_REG_ADDR_QTABLE                             0x0a0
+#define G1_REG_ADDR_DIR_MV                             0x0a4
+#define G1_REG_BD_REF_PIC(i)                           (0x0a8 + ((i) * 0x4))
+#define     G1_REG_BD_REF_PIC_BINIT_RLIST_B2(x)                (((x) & 0x1f) << 25)
+#define     G1_REG_BD_REF_PIC_BINIT_RLIST_F2(x)                (((x) & 0x1f) << 20)
+#define     G1_REG_BD_REF_PIC_BINIT_RLIST_B1(x)                (((x) & 0x1f) << 15)
+#define     G1_REG_BD_REF_PIC_BINIT_RLIST_F1(x)                (((x) & 0x1f) << 10)
+#define     G1_REG_BD_REF_PIC_BINIT_RLIST_B0(x)                (((x) & 0x1f) << 5)
+#define     G1_REG_BD_REF_PIC_BINIT_RLIST_F0(x)                (((x) & 0x1f) << 0)
+#define     G1_REG_BD_REF_PIC_PRED_TAP_2_M1(x)         (((x) & 0x3) << 10)
+#define     G1_REG_BD_REF_PIC_PRED_TAP_2_4(x)          (((x) & 0x3) << 8)
+#define     G1_REG_BD_REF_PIC_PRED_TAP_4_M1(x)         (((x) & 0x3) << 6)
+#define     G1_REG_BD_REF_PIC_PRED_TAP_4_4(x)          (((x) & 0x3) << 4)
+#define     G1_REG_BD_REF_PIC_PRED_TAP_6_M1(x)         (((x) & 0x3) << 2)
+#define     G1_REG_BD_REF_PIC_PRED_TAP_6_4(x)          (((x) & 0x3) << 0)
+#define     G1_REG_BD_REF_PIC_QUANT_DELTA_2(x)         (((x) & 0x1f) << 27)
+#define     G1_REG_BD_REF_PIC_QUANT_DELTA_3(x)         (((x) & 0x1f) << 22)
+#define     G1_REG_BD_REF_PIC_QUANT_2(x)               (((x) & 0x7ff) << 11)
+#define     G1_REG_BD_REF_PIC_QUANT_3(x)               (((x) & 0x7ff) << 0)
+#define G1_REG_BD_P_REF_PIC                            0x0bc
+#define     G1_REG_BD_P_REF_PIC_QUANT_DELTA_4(x)       (((x) & 0x1f) << 27)
+#define     G1_REG_BD_P_REF_PIC_PINIT_RLIST_F3(x)      (((x) & 0x1f) << 25)
+#define     G1_REG_BD_P_REF_PIC_PINIT_RLIST_F2(x)      (((x) & 0x1f) << 20)
+#define     G1_REG_BD_P_REF_PIC_PINIT_RLIST_F1(x)      (((x) & 0x1f) << 15)
+#define     G1_REG_BD_P_REF_PIC_PINIT_RLIST_F0(x)      (((x) & 0x1f) << 10)
+#define     G1_REG_BD_P_REF_PIC_BINIT_RLIST_B15(x)     (((x) & 0x1f) << 5)
+#define     G1_REG_BD_P_REF_PIC_BINIT_RLIST_F15(x)     (((x) & 0x1f) << 0)
+#define G1_REG_ERR_CONC                                        0x0c0
+#define     G1_REG_ERR_CONC_STARTMB_X(x)               (((x) & 0x1ff) << 23)
+#define     G1_REG_ERR_CONC_STARTMB_Y(x)               (((x) & 0xff) << 15)
+#define G1_REG_PRED_FLT                                        0x0c4
+#define     G1_REG_PRED_FLT_PRED_BC_TAP_0_0(x)         (((x) & 0x3ff) << 22)
+#define     G1_REG_PRED_FLT_PRED_BC_TAP_0_1(x)         (((x) & 0x3ff) << 12)
+#define     G1_REG_PRED_FLT_PRED_BC_TAP_0_2(x)         (((x) & 0x3ff) << 2)
+#define G1_REG_REF_BUF_CTRL                            0x0cc
+#define     G1_REG_REF_BUF_CTRL_REFBU_E                        BIT(31)
+#define     G1_REG_REF_BUF_CTRL_REFBU_THR(x)           (((x) & 0xfff) << 19)
+#define     G1_REG_REF_BUF_CTRL_REFBU_PICID(x)         (((x) & 0x1f) << 14)
+#define     G1_REG_REF_BUF_CTRL_REFBU_EVAL_E           BIT(13)
+#define     G1_REG_REF_BUF_CTRL_REFBU_FPARMOD_E                BIT(12)
+#define     G1_REG_REF_BUF_CTRL_REFBU_Y_OFFSET(x)      (((x) & 0x1ff) << 0)
+#define G1_REG_REF_BUF_CTRL2                           0x0dc
+#define     G1_REG_REF_BUF_CTRL2_REFBU2_BUF_E          BIT(31)
+#define     G1_REG_REF_BUF_CTRL2_REFBU2_THR(x)         (((x) & 0xfff) << 19)
+#define     G1_REG_REF_BUF_CTRL2_REFBU2_PICID(x)       (((x) & 0x1f) << 14)
+#define     G1_REG_REF_BUF_CTRL2_APF_THRESHOLD(x)      (((x) & 0x3fff) << 0)
+#define G1_REG_SOFT_RESET                              0x194
+
+#endif /* HANTRO_G1_REGS_H_ */
diff --git a/drivers/staging/media/hantro/hantro_h1_jpeg_enc.c b/drivers/staging/media/hantro/hantro_h1_jpeg_enc.c
new file mode 100644 (file)
index 0000000..0c1e304
--- /dev/null
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ */
+
+#include <asm/unaligned.h>
+#include <media/v4l2-mem2mem.h>
+#include "hantro_jpeg.h"
+#include "hantro.h"
+#include "hantro_v4l2.h"
+#include "hantro_hw.h"
+#include "hantro_h1_regs.h"
+
+#define H1_JPEG_QUANT_TABLE_COUNT 16
+
+static void hantro_h1_set_src_img_ctrl(struct hantro_dev *vpu,
+                                      struct hantro_ctx *ctx)
+{
+       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
+       u32 reg;
+
+       reg = H1_REG_IN_IMG_CTRL_ROW_LEN(pix_fmt->width)
+               | H1_REG_IN_IMG_CTRL_OVRFLR_D4(0)
+               | H1_REG_IN_IMG_CTRL_OVRFLB_D4(0)
+               | H1_REG_IN_IMG_CTRL_FMT(ctx->vpu_src_fmt->enc_fmt);
+       vepu_write_relaxed(vpu, reg, H1_REG_IN_IMG_CTRL);
+}
+
+static void hantro_h1_jpeg_enc_set_buffers(struct hantro_dev *vpu,
+                                          struct hantro_ctx *ctx,
+                                          struct vb2_buffer *src_buf)
+{
+       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
+       dma_addr_t src[3];
+
+       WARN_ON(pix_fmt->num_planes > 3);
+
+       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.dma,
+                          H1_REG_ADDR_OUTPUT_STREAM);
+       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.size,
+                          H1_REG_STR_BUF_LIMIT);
+
+       if (pix_fmt->num_planes == 1) {
+               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+               /* single plane formats we supported are all interlaced */
+               vepu_write_relaxed(vpu, src[0], H1_REG_ADDR_IN_PLANE_0);
+       } else if (pix_fmt->num_planes == 2) {
+               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
+               vepu_write_relaxed(vpu, src[0], H1_REG_ADDR_IN_PLANE_0);
+               vepu_write_relaxed(vpu, src[1], H1_REG_ADDR_IN_PLANE_1);
+       } else {
+               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
+               src[2] = vb2_dma_contig_plane_dma_addr(src_buf, 2);
+               vepu_write_relaxed(vpu, src[0], H1_REG_ADDR_IN_PLANE_0);
+               vepu_write_relaxed(vpu, src[1], H1_REG_ADDR_IN_PLANE_1);
+               vepu_write_relaxed(vpu, src[2], H1_REG_ADDR_IN_PLANE_2);
+       }
+}
+
+static void
+hantro_h1_jpeg_enc_set_qtable(struct hantro_dev *vpu,
+                             unsigned char *luma_qtable,
+                             unsigned char *chroma_qtable)
+{
+       u32 reg, i;
+
+       for (i = 0; i < H1_JPEG_QUANT_TABLE_COUNT; i++) {
+               reg = get_unaligned_be32(&luma_qtable[i]);
+               vepu_write_relaxed(vpu, reg, H1_REG_JPEG_LUMA_QUAT(i));
+
+               reg = get_unaligned_be32(&chroma_qtable[i]);
+               vepu_write_relaxed(vpu, reg, H1_REG_JPEG_CHROMA_QUAT(i));
+       }
+}
+
+void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *src_buf, *dst_buf;
+       struct hantro_jpeg_ctx jpeg_ctx;
+       u32 reg;
+
+       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+
+       memset(&jpeg_ctx, 0, sizeof(jpeg_ctx));
+       jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
+       jpeg_ctx.width = ctx->dst_fmt.width;
+       jpeg_ctx.height = ctx->dst_fmt.height;
+       jpeg_ctx.quality = ctx->jpeg_quality;
+       hantro_jpeg_header_assemble(&jpeg_ctx);
+
+       /* Switch to JPEG encoder mode before writing registers */
+       vepu_write_relaxed(vpu, H1_REG_ENC_CTRL_ENC_MODE_JPEG,
+                          H1_REG_ENC_CTRL);
+
+       hantro_h1_set_src_img_ctrl(vpu, ctx);
+       hantro_h1_jpeg_enc_set_buffers(vpu, ctx, &src_buf->vb2_buf);
+       hantro_h1_jpeg_enc_set_qtable(vpu,
+                                     hantro_jpeg_get_qtable(&jpeg_ctx, 0),
+                                     hantro_jpeg_get_qtable(&jpeg_ctx, 1));
+
+       reg = H1_REG_AXI_CTRL_OUTPUT_SWAP16
+               | H1_REG_AXI_CTRL_INPUT_SWAP16
+               | H1_REG_AXI_CTRL_BURST_LEN(16)
+               | H1_REG_AXI_CTRL_OUTPUT_SWAP32
+               | H1_REG_AXI_CTRL_INPUT_SWAP32
+               | H1_REG_AXI_CTRL_OUTPUT_SWAP8
+               | H1_REG_AXI_CTRL_INPUT_SWAP8;
+       /* Make sure that all registers are written at this point. */
+       vepu_write(vpu, reg, H1_REG_AXI_CTRL);
+
+       reg = H1_REG_ENC_CTRL_WIDTH(JPEG_MB_WIDTH(ctx->src_fmt.width))
+               | H1_REG_ENC_CTRL_HEIGHT(JPEG_MB_HEIGHT(ctx->src_fmt.height))
+               | H1_REG_ENC_CTRL_ENC_MODE_JPEG
+               | H1_REG_ENC_PIC_INTRA
+               | H1_REG_ENC_CTRL_EN_BIT;
+       /* Kick the watchdog and start encoding */
+       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
+       vepu_write(vpu, reg, H1_REG_ENC_CTRL);
+}
diff --git a/drivers/staging/media/hantro/hantro_h1_regs.h b/drivers/staging/media/hantro/hantro_h1_regs.h
new file mode 100644 (file)
index 0000000..d6e9825
--- /dev/null
@@ -0,0 +1,154 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ */
+
+#ifndef HANTRO_H1_REGS_H_
+#define HANTRO_H1_REGS_H_
+
+/* Encoder registers. */
+#define H1_REG_INTERRUPT                               0x004
+#define     H1_REG_INTERRUPT_FRAME_RDY                 BIT(2)
+#define     H1_REG_INTERRUPT_DIS_BIT                   BIT(1)
+#define     H1_REG_INTERRUPT_BIT                       BIT(0)
+#define H1_REG_AXI_CTRL                                        0x008
+#define     H1_REG_AXI_CTRL_OUTPUT_SWAP16              BIT(15)
+#define     H1_REG_AXI_CTRL_INPUT_SWAP16               BIT(14)
+#define     H1_REG_AXI_CTRL_BURST_LEN(x)               ((x) << 8)
+#define     H1_REG_AXI_CTRL_GATE_BIT                   BIT(4)
+#define     H1_REG_AXI_CTRL_OUTPUT_SWAP32              BIT(3)
+#define     H1_REG_AXI_CTRL_INPUT_SWAP32               BIT(2)
+#define     H1_REG_AXI_CTRL_OUTPUT_SWAP8               BIT(1)
+#define     H1_REG_AXI_CTRL_INPUT_SWAP8                        BIT(0)
+#define H1_REG_ADDR_OUTPUT_STREAM                      0x014
+#define H1_REG_ADDR_OUTPUT_CTRL                                0x018
+#define H1_REG_ADDR_REF_LUMA                           0x01c
+#define H1_REG_ADDR_REF_CHROMA                         0x020
+#define H1_REG_ADDR_REC_LUMA                           0x024
+#define H1_REG_ADDR_REC_CHROMA                         0x028
+#define H1_REG_ADDR_IN_PLANE_0                         0x02c
+#define H1_REG_ADDR_IN_PLANE_1                         0x030
+#define H1_REG_ADDR_IN_PLANE_2                         0x034
+#define H1_REG_ENC_CTRL                                        0x038
+#define     H1_REG_ENC_CTRL_TIMEOUT_EN                 BIT(31)
+#define     H1_REG_ENC_CTRL_NAL_MODE_BIT               BIT(29)
+#define     H1_REG_ENC_CTRL_WIDTH(w)                   ((w) << 19)
+#define     H1_REG_ENC_CTRL_HEIGHT(h)                  ((h) << 10)
+#define     H1_REG_ENC_PIC_INTER                       (0x0 << 3)
+#define     H1_REG_ENC_PIC_INTRA                       (0x1 << 3)
+#define     H1_REG_ENC_PIC_MVCINTER                    (0x2 << 3)
+#define     H1_REG_ENC_CTRL_ENC_MODE_H264              (0x3 << 1)
+#define     H1_REG_ENC_CTRL_ENC_MODE_JPEG              (0x2 << 1)
+#define     H1_REG_ENC_CTRL_ENC_MODE_VP8               (0x1 << 1)
+#define     H1_REG_ENC_CTRL_EN_BIT                     BIT(0)
+#define H1_REG_IN_IMG_CTRL                             0x03c
+#define     H1_REG_IN_IMG_CTRL_ROW_LEN(x)              ((x) << 12)
+#define     H1_REG_IN_IMG_CTRL_OVRFLR_D4(x)            ((x) << 10)
+#define     H1_REG_IN_IMG_CTRL_OVRFLB_D4(x)            ((x) << 6)
+#define     H1_REG_IN_IMG_CTRL_FMT(x)                  ((x) << 2)
+#define H1_REG_ENC_CTRL0                               0x040
+#define    H1_REG_ENC_CTRL0_INIT_QP(x)                 ((x) << 26)
+#define    H1_REG_ENC_CTRL0_SLICE_ALPHA(x)             ((x) << 22)
+#define    H1_REG_ENC_CTRL0_SLICE_BETA(x)              ((x) << 18)
+#define    H1_REG_ENC_CTRL0_CHROMA_QP_OFFSET(x)                ((x) << 13)
+#define    H1_REG_ENC_CTRL0_FILTER_DIS(x)              ((x) << 5)
+#define    H1_REG_ENC_CTRL0_IDR_PICID(x)               ((x) << 1)
+#define    H1_REG_ENC_CTRL0_CONSTR_INTRA_PRED          BIT(0)
+#define H1_REG_ENC_CTRL1                               0x044
+#define    H1_REG_ENC_CTRL1_PPS_ID(x)                  ((x) << 24)
+#define    H1_REG_ENC_CTRL1_INTRA_PRED_MODE(x)         ((x) << 16)
+#define    H1_REG_ENC_CTRL1_FRAME_NUM(x)               ((x))
+#define H1_REG_ENC_CTRL2                               0x048
+#define    H1_REG_ENC_CTRL2_DEBLOCKING_FILETER_MODE(x) ((x) << 30)
+#define    H1_REG_ENC_CTRL2_H264_SLICE_SIZE(x)         ((x) << 23)
+#define    H1_REG_ENC_CTRL2_DISABLE_QUARTER_PIXMV      BIT(22)
+#define    H1_REG_ENC_CTRL2_TRANS8X8_MODE_EN           BIT(21)
+#define    H1_REG_ENC_CTRL2_CABAC_INIT_IDC(x)          ((x) << 19)
+#define    H1_REG_ENC_CTRL2_ENTROPY_CODING_MODE                BIT(18)
+#define    H1_REG_ENC_CTRL2_H264_INTER4X4_MODE         BIT(17)
+#define    H1_REG_ENC_CTRL2_H264_STREAM_MODE           BIT(16)
+#define    H1_REG_ENC_CTRL2_INTRA16X16_MODE(x)         ((x))
+#define H1_REG_ENC_CTRL3                               0x04c
+#define    H1_REG_ENC_CTRL3_MUTIMV_EN                  BIT(30)
+#define    H1_REG_ENC_CTRL3_MV_PENALTY_1_4P(x)         ((x) << 20)
+#define    H1_REG_ENC_CTRL3_MV_PENALTY_4P(x)           ((x) << 10)
+#define    H1_REG_ENC_CTRL3_MV_PENALTY_1P(x)           ((x))
+#define H1_REG_ENC_CTRL4                               0x050
+#define    H1_REG_ENC_CTRL4_MV_PENALTY_16X8_8X16(x)    ((x) << 20)
+#define    H1_REG_ENC_CTRL4_MV_PENALTY_8X8(x)          ((x) << 10)
+#define    H1_REG_ENC_CTRL4_8X4_4X8(x)                 ((x))
+#define H1_REG_ENC_CTRL5                               0x054
+#define    H1_REG_ENC_CTRL5_MACROBLOCK_PENALTY(x)      ((x) << 24)
+#define    H1_REG_ENC_CTRL5_COMPLETE_SLICES(x)         ((x) << 16)
+#define    H1_REG_ENC_CTRL5_INTER_MODE(x)              ((x))
+#define H1_REG_STR_HDR_REM_MSB                         0x058
+#define H1_REG_STR_HDR_REM_LSB                         0x05c
+#define H1_REG_STR_BUF_LIMIT                           0x060
+#define H1_REG_MAD_CTRL                                        0x064
+#define    H1_REG_MAD_CTRL_QP_ADJUST(x)                        ((x) << 28)
+#define    H1_REG_MAD_CTRL_MAD_THREDHOLD(x)            ((x) << 22)
+#define    H1_REG_MAD_CTRL_QP_SUM_DIV2(x)              ((x))
+#define H1_REG_ADDR_VP8_PROB_CNT                       0x068
+#define H1_REG_QP_VAL                                  0x06c
+#define    H1_REG_QP_VAL_LUM(x)                                ((x) << 26)
+#define    H1_REG_QP_VAL_MAX(x)                                ((x) << 20)
+#define    H1_REG_QP_VAL_MIN(x)                                ((x) << 14)
+#define    H1_REG_QP_VAL_CHECKPOINT_DISTAN(x)          ((x))
+#define H1_REG_VP8_QP_VAL(i)                           (0x06c + ((i) * 0x4))
+#define H1_REG_CHECKPOINT(i)                           (0x070 + ((i) * 0x4))
+#define     H1_REG_CHECKPOINT_CHECK0(x)                        (((x) & 0xffff))
+#define     H1_REG_CHECKPOINT_CHECK1(x)                        (((x) & 0xffff) << 16)
+#define     H1_REG_CHECKPOINT_RESULT(x)                        ((((x) >> (16 - 16 \
+                                                        * (i & 1))) & 0xffff) \
+                                                        * 32)
+#define H1_REG_CHKPT_WORD_ERR(i)                       (0x084 + ((i) * 0x4))
+#define     H1_REG_CHKPT_WORD_ERR_CHK0(x)              (((x) & 0xffff))
+#define     H1_REG_CHKPT_WORD_ERR_CHK1(x)              (((x) & 0xffff) << 16)
+#define H1_REG_VP8_BOOL_ENC                            0x08c
+#define H1_REG_CHKPT_DELTA_QP                          0x090
+#define     H1_REG_CHKPT_DELTA_QP_CHK0(x)              (((x) & 0x0f) << 0)
+#define     H1_REG_CHKPT_DELTA_QP_CHK1(x)              (((x) & 0x0f) << 4)
+#define     H1_REG_CHKPT_DELTA_QP_CHK2(x)              (((x) & 0x0f) << 8)
+#define     H1_REG_CHKPT_DELTA_QP_CHK3(x)              (((x) & 0x0f) << 12)
+#define     H1_REG_CHKPT_DELTA_QP_CHK4(x)              (((x) & 0x0f) << 16)
+#define     H1_REG_CHKPT_DELTA_QP_CHK5(x)              (((x) & 0x0f) << 20)
+#define     H1_REG_CHKPT_DELTA_QP_CHK6(x)              (((x) & 0x0f) << 24)
+#define H1_REG_VP8_CTRL0                               0x090
+#define H1_REG_RLC_CTRL                                        0x094
+#define     H1_REG_RLC_CTRL_STR_OFFS_SHIFT             23
+#define     H1_REG_RLC_CTRL_STR_OFFS_MASK              (0x3f << 23)
+#define     H1_REG_RLC_CTRL_RLC_SUM(x)                 ((x))
+#define H1_REG_MB_CTRL                                 0x098
+#define     H1_REG_MB_CNT_OUT(x)                       (((x) & 0xffff))
+#define     H1_REG_MB_CNT_SET(x)                       (((x) & 0xffff) << 16)
+#define H1_REG_ADDR_NEXT_PIC                           0x09c
+#define        H1_REG_JPEG_LUMA_QUAT(i)                        (0x100 + ((i) * 0x4))
+#define        H1_REG_JPEG_CHROMA_QUAT(i)                      (0x140 + ((i) * 0x4))
+#define H1_REG_STABILIZATION_OUTPUT                    0x0A0
+#define H1_REG_ADDR_CABAC_TBL                          0x0cc
+#define H1_REG_ADDR_MV_OUT                             0x0d0
+#define H1_REG_RGB_YUV_COEFF(i)                                (0x0d4 + ((i) * 0x4))
+#define H1_REG_RGB_MASK_MSB                            0x0dc
+#define H1_REG_INTRA_AREA_CTRL                         0x0e0
+#define H1_REG_CIR_INTRA_CTRL                          0x0e4
+#define H1_REG_INTRA_SLICE_BITMAP(i)                   (0x0e8 + ((i) * 0x4))
+#define H1_REG_ADDR_VP8_DCT_PART(i)                    (0x0e8 + ((i) * 0x4))
+#define H1_REG_FIRST_ROI_AREA                          0x0f0
+#define H1_REG_SECOND_ROI_AREA                         0x0f4
+#define H1_REG_MVC_CTRL                                        0x0f8
+#define        H1_REG_MVC_CTRL_MV16X16_FAVOR(x)                ((x) << 28)
+#define H1_REG_VP8_INTRA_PENALTY(i)                    (0x100 + ((i) * 0x4))
+#define H1_REG_ADDR_VP8_SEG_MAP                                0x11c
+#define H1_REG_VP8_SEG_QP(i)                           (0x120 + ((i) * 0x4))
+#define H1_REG_DMV_4P_1P_PENALTY(i)                    (0x180 + ((i) * 0x4))
+#define     H1_REG_DMV_4P_1P_PENALTY_BIT(x, i)         ((x) << (i) * 8)
+#define H1_REG_DMV_QPEL_PENALTY(i)                     (0x200 + ((i) * 0x4))
+#define     H1_REG_DMV_QPEL_PENALTY_BIT(x, i)          ((x) << (i) * 8)
+#define H1_REG_VP8_CTRL1                               0x280
+#define H1_REG_VP8_BIT_COST_GOLDEN                     0x284
+#define H1_REG_VP8_LOOP_FLT_DELTA(i)                   (0x288 + ((i) * 0x4))
+
+#endif /* HANTRO_H1_REGS_H_ */
diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
new file mode 100644 (file)
index 0000000..3c361c2
--- /dev/null
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ */
+
+#ifndef HANTRO_HW_H_
+#define HANTRO_HW_H_
+
+#include <linux/interrupt.h>
+#include <linux/v4l2-controls.h>
+#include <media/mpeg2-ctrls.h>
+#include <media/videobuf2-core.h>
+
+struct hantro_dev;
+struct hantro_ctx;
+struct hantro_buf;
+struct hantro_variant;
+
+/**
+ * struct hantro_aux_buf - auxiliary DMA buffer for hardware data
+ * @cpu:       CPU pointer to the buffer.
+ * @dma:       DMA address of the buffer.
+ * @size:      Size of the buffer.
+ */
+struct hantro_aux_buf {
+       void *cpu;
+       dma_addr_t dma;
+       size_t size;
+};
+
+/**
+ * struct hantro_jpeg_enc_hw_ctx
+ * @bounce_buffer:     Bounce buffer
+ */
+struct hantro_jpeg_enc_hw_ctx {
+       struct hantro_aux_buf bounce_buffer;
+};
+
+/**
+ * struct hantro_mpeg2_dec_hw_ctx
+ * @qtable:            Quantization table
+ */
+struct hantro_mpeg2_dec_hw_ctx {
+       struct hantro_aux_buf qtable;
+};
+
+/**
+ * struct hantro_codec_ops - codec mode specific operations
+ *
+ * @init:      If needed, can be used for initialization.
+ *             Optional and called from process context.
+ * @exit:      If needed, can be used to undo the .init phase.
+ *             Optional and called from process context.
+ * @run:       Start single {en,de)coding job. Called from atomic context
+ *             to indicate that a pair of buffers is ready and the hardware
+ *             should be programmed and started.
+ * @done:      Read back processing results and additional data from hardware.
+ * @reset:     Reset the hardware in case of a timeout.
+ */
+struct hantro_codec_ops {
+       int (*init)(struct hantro_ctx *ctx);
+       void (*exit)(struct hantro_ctx *ctx);
+       void (*run)(struct hantro_ctx *ctx);
+       void (*done)(struct hantro_ctx *ctx, enum vb2_buffer_state);
+       void (*reset)(struct hantro_ctx *ctx);
+};
+
+/**
+ * enum hantro_enc_fmt - source format ID for hardware registers.
+ */
+enum hantro_enc_fmt {
+       RK3288_VPU_ENC_FMT_YUV420P = 0,
+       RK3288_VPU_ENC_FMT_YUV420SP = 1,
+       RK3288_VPU_ENC_FMT_YUYV422 = 2,
+       RK3288_VPU_ENC_FMT_UYVY422 = 3,
+};
+
+extern const struct hantro_variant rk3399_vpu_variant;
+extern const struct hantro_variant rk3328_vpu_variant;
+extern const struct hantro_variant rk3288_vpu_variant;
+
+void hantro_watchdog(struct work_struct *work);
+void hantro_run(struct hantro_ctx *ctx);
+void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused,
+                    enum vb2_buffer_state result);
+
+void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx);
+void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx);
+int hantro_jpeg_enc_init(struct hantro_ctx *ctx);
+void hantro_jpeg_enc_exit(struct hantro_ctx *ctx);
+
+void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx);
+void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx);
+void hantro_mpeg2_dec_copy_qtable(u8 *qtable,
+       const struct v4l2_ctrl_mpeg2_quantization *ctrl);
+int hantro_mpeg2_dec_init(struct hantro_ctx *ctx);
+void hantro_mpeg2_dec_exit(struct hantro_ctx *ctx);
+
+#endif /* HANTRO_HW_H_ */
diff --git a/drivers/staging/media/hantro/hantro_jpeg.c b/drivers/staging/media/hantro/hantro_jpeg.c
new file mode 100644 (file)
index 0000000..125eb41
--- /dev/null
@@ -0,0 +1,319 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) Collabora, Ltd.
+ *
+ * Based on GSPCA and CODA drivers:
+ * Copyright (C) Jean-Francois Moine (http://moinejf.free.fr)
+ * Copyright (C) 2014 Philipp Zabel, Pengutronix
+ */
+#include <linux/dma-mapping.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include "hantro_jpeg.h"
+#include "hantro.h"
+
+#define LUMA_QUANT_OFF         7
+#define CHROMA_QUANT_OFF       72
+#define HEIGHT_OFF             141
+#define WIDTH_OFF              143
+
+#define HUFF_LUMA_DC_OFF       160
+#define HUFF_LUMA_AC_OFF       193
+#define HUFF_CHROMA_DC_OFF     376
+#define HUFF_CHROMA_AC_OFF     409
+
+/* Default tables from JPEG ITU-T.81
+ * (ISO/IEC 10918-1) Annex K.3, I
+ */
+static const unsigned char luma_q_table[] = {
+       0x10, 0x0b, 0x0a, 0x10, 0x7c, 0x8c, 0x97, 0xa1,
+       0x0c, 0x0c, 0x0e, 0x13, 0x7e, 0x9e, 0xa0, 0x9b,
+       0x0e, 0x0d, 0x10, 0x18, 0x8c, 0x9d, 0xa9, 0x9c,
+       0x0e, 0x11, 0x16, 0x1d, 0x97, 0xbb, 0xb4, 0xa2,
+       0x12, 0x16, 0x25, 0x38, 0xa8, 0x6d, 0x67, 0xb1,
+       0x18, 0x23, 0x37, 0x40, 0xb5, 0x68, 0x71, 0xc0,
+       0x31, 0x40, 0x4e, 0x57, 0x67, 0x79, 0x78, 0x65,
+       0x48, 0x5c, 0x5f, 0x62, 0x70, 0x64, 0x67, 0xc7,
+};
+
+static const unsigned char chroma_q_table[] = {
+       0x11, 0x12, 0x18, 0x2f, 0x63, 0x63, 0x63, 0x63,
+       0x12, 0x15, 0x1a, 0x42, 0x63, 0x63, 0x63, 0x63,
+       0x18, 0x1a, 0x38, 0x63, 0x63, 0x63, 0x63, 0x63,
+       0x2f, 0x42, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
+       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63
+};
+
+/* Huffman tables are shared with CODA */
+static const unsigned char luma_dc_table[] = {
+       0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+       0x08, 0x09, 0x0a, 0x0b,
+};
+
+static const unsigned char chroma_dc_table[] = {
+       0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+       0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+       0x08, 0x09, 0x0a, 0x0b,
+};
+
+static const unsigned char luma_ac_table[] = {
+       0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
+       0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
+       0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+       0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+       0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+       0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+       0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
+       0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+       0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+       0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+       0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+       0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+       0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+       0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+       0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+       0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+       0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+       0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
+       0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
+       0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+       0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
+       0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+       0xf9, 0xfa,
+};
+
+static const unsigned char chroma_ac_table[] = {
+       0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
+       0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
+       0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
+       0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+       0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+       0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
+       0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
+       0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+       0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+       0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+       0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+       0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+       0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+       0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+       0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+       0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
+       0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+       0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
+       0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+       0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+       0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+       0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+       0xf9, 0xfa,
+};
+
+/* For simplicity, we keep a pre-formatted JPEG header,
+ * and we'll use fixed offsets to change the width, height
+ * quantization tables, etc.
+ */
+static const unsigned char hantro_jpeg_header[JPEG_HEADER_SIZE] = {
+       /* SOI */
+       0xff, 0xd8,
+
+       /* DQT */
+       0xff, 0xdb, 0x00, 0x84,
+
+       0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+       0x01,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+       /* SOF */
+       0xff, 0xc0, 0x00, 0x11, 0x08, 0x00, 0xf0, 0x01,
+       0x40, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01,
+       0x03, 0x11, 0x01,
+
+       /* DHT */
+       0xff, 0xc4, 0x00, 0x1f, 0x00,
+
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       /* DHT */
+       0xff, 0xc4, 0x00, 0xb5, 0x10,
+
+       0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+       /* DHT */
+       0xff, 0xc4, 0x00, 0x1f, 0x01,
+
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+
+       /* DHT */
+       0xff, 0xc4, 0x00, 0xb5, 0x11,
+
+       0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+       /* SOS */
+       0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02,
+       0x11, 0x03, 0x11, 0x00, 0x3f, 0x00,
+};
+
+static void
+jpeg_scale_quant_table(unsigned char *q_tab,
+                      const unsigned char *tab, int scale)
+{
+       unsigned int temp;
+       int i;
+
+       for (i = 0; i < 64; i++) {
+               temp = DIV_ROUND_CLOSEST((unsigned int)tab[i] * scale, 100);
+               if (temp <= 0)
+                       temp = 1;
+               if (temp > 255)
+                       temp = 255;
+               q_tab[i] = (unsigned char)temp;
+       }
+}
+
+static void jpeg_set_quality(unsigned char *buffer, int quality)
+{
+       int scale;
+
+       /*
+        * Non-linear scaling factor:
+        * [5,50] -> [1000..100], [51,100] -> [98..0]
+        */
+       if (quality < 50)
+               scale = 5000 / quality;
+       else
+               scale = 200 - 2 * quality;
+
+       jpeg_scale_quant_table(buffer + LUMA_QUANT_OFF,
+                              luma_q_table, scale);
+       jpeg_scale_quant_table(buffer + CHROMA_QUANT_OFF,
+                              chroma_q_table, scale);
+}
+
+unsigned char *
+hantro_jpeg_get_qtable(struct hantro_jpeg_ctx *ctx, int index)
+{
+       if (index == 0)
+               return ctx->buffer + LUMA_QUANT_OFF;
+       return ctx->buffer + CHROMA_QUANT_OFF;
+}
+
+void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx)
+{
+       char *buf = ctx->buffer;
+
+       memcpy(buf, hantro_jpeg_header,
+              sizeof(hantro_jpeg_header));
+
+       buf[HEIGHT_OFF + 0] = ctx->height >> 8;
+       buf[HEIGHT_OFF + 1] = ctx->height;
+       buf[WIDTH_OFF + 0] = ctx->width >> 8;
+       buf[WIDTH_OFF + 1] = ctx->width;
+
+       memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, sizeof(luma_dc_table));
+       memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, sizeof(luma_ac_table));
+       memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table,
+              sizeof(chroma_dc_table));
+       memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table,
+              sizeof(chroma_ac_table));
+
+       jpeg_set_quality(buf, ctx->quality);
+}
+
+int hantro_jpeg_enc_init(struct hantro_ctx *ctx)
+{
+       ctx->jpeg_enc.bounce_buffer.size =
+               ctx->dst_fmt.plane_fmt[0].sizeimage -
+               ctx->vpu_dst_fmt->header_size;
+
+       ctx->jpeg_enc.bounce_buffer.cpu =
+               dma_alloc_attrs(ctx->dev->dev,
+                               ctx->jpeg_enc.bounce_buffer.size,
+                               &ctx->jpeg_enc.bounce_buffer.dma,
+                               GFP_KERNEL,
+                               DMA_ATTR_ALLOC_SINGLE_PAGES);
+       if (!ctx->jpeg_enc.bounce_buffer.cpu)
+               return -ENOMEM;
+
+       return 0;
+}
+
+void hantro_jpeg_enc_exit(struct hantro_ctx *ctx)
+{
+       dma_free_attrs(ctx->dev->dev,
+                      ctx->jpeg_enc.bounce_buffer.size,
+                      ctx->jpeg_enc.bounce_buffer.cpu,
+                      ctx->jpeg_enc.bounce_buffer.dma,
+                      DMA_ATTR_ALLOC_SINGLE_PAGES);
+}
diff --git a/drivers/staging/media/hantro/hantro_jpeg.h b/drivers/staging/media/hantro/hantro_jpeg.h
new file mode 100644 (file)
index 0000000..9e8397c
--- /dev/null
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#define JPEG_HEADER_SIZE       601
+
+struct hantro_jpeg_ctx {
+       int width;
+       int height;
+       int quality;
+       unsigned char *buffer;
+};
+
+unsigned char *hantro_jpeg_get_qtable(struct hantro_jpeg_ctx *ctx, int index);
+void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx);
diff --git a/drivers/staging/media/hantro/hantro_mpeg2.c b/drivers/staging/media/hantro/hantro_mpeg2.c
new file mode 100644 (file)
index 0000000..1d334e6
--- /dev/null
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ */
+
+#include "hantro.h"
+
+static const u8 zigzag[64] = {
+       0,   1,  8, 16,  9,  2,  3, 10,
+       17, 24, 32, 25, 18, 11,  4,  5,
+       12, 19, 26, 33, 40, 48, 41, 34,
+       27, 20, 13,  6,  7, 14, 21, 28,
+       35, 42, 49, 56, 57, 50, 43, 36,
+       29, 22, 15, 23, 30, 37, 44, 51,
+       58, 59, 52, 45, 38, 31, 39, 46,
+       53, 60, 61, 54, 47, 55, 62, 63
+};
+
+void hantro_mpeg2_dec_copy_qtable(u8 *qtable,
+       const struct v4l2_ctrl_mpeg2_quantization *ctrl)
+{
+       int i, n;
+
+       if (!qtable || !ctrl)
+               return;
+
+       for (i = 0; i < ARRAY_SIZE(zigzag); i++) {
+               n = zigzag[i];
+               qtable[n + 0] = ctrl->intra_quantiser_matrix[i];
+               qtable[n + 64] = ctrl->non_intra_quantiser_matrix[i];
+               qtable[n + 128] = ctrl->chroma_intra_quantiser_matrix[i];
+               qtable[n + 192] = ctrl->chroma_non_intra_quantiser_matrix[i];
+       }
+}
+
+int hantro_mpeg2_dec_init(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+
+       ctx->mpeg2_dec.qtable.size = ARRAY_SIZE(zigzag) * 4;
+       ctx->mpeg2_dec.qtable.cpu =
+               dma_alloc_coherent(vpu->dev,
+                                  ctx->mpeg2_dec.qtable.size,
+                                  &ctx->mpeg2_dec.qtable.dma,
+                                  GFP_KERNEL);
+       if (!ctx->mpeg2_dec.qtable.cpu)
+               return -ENOMEM;
+       return 0;
+}
+
+void hantro_mpeg2_dec_exit(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+
+       dma_free_coherent(vpu->dev,
+                         ctx->mpeg2_dec.qtable.size,
+                         ctx->mpeg2_dec.qtable.cpu,
+                         ctx->mpeg2_dec.qtable.dma);
+}
diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c
new file mode 100644 (file)
index 0000000..b4af8c6
--- /dev/null
@@ -0,0 +1,686 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Collabora, Ltd.
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ *     Alpha Lin <Alpha.Lin@rock-chips.com>
+ *     Jeffy Chen <jeffy.chen@rock-chips.com>
+ *
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ *
+ * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
+ * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/pm_runtime.h>
+#include <linux/videodev2.h>
+#include <linux/workqueue.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-sg.h>
+
+#include "hantro.h"
+#include "hantro_hw.h"
+#include "hantro_v4l2.h"
+
+static const struct hantro_fmt *
+hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts)
+{
+       const struct hantro_fmt *formats;
+
+       if (hantro_is_encoder_ctx(ctx)) {
+               formats = ctx->dev->variant->enc_fmts;
+               *num_fmts = ctx->dev->variant->num_enc_fmts;
+       } else {
+               formats = ctx->dev->variant->dec_fmts;
+               *num_fmts = ctx->dev->variant->num_dec_fmts;
+       }
+
+       return formats;
+}
+
+static const struct hantro_fmt *
+hantro_find_format(const struct hantro_fmt *formats, unsigned int num_fmts,
+                  u32 fourcc)
+{
+       unsigned int i;
+
+       for (i = 0; i < num_fmts; i++)
+               if (formats[i].fourcc == fourcc)
+                       return &formats[i];
+       return NULL;
+}
+
+static const struct hantro_fmt *
+hantro_get_default_fmt(const struct hantro_fmt *formats, unsigned int num_fmts,
+                      bool bitstream)
+{
+       unsigned int i;
+
+       for (i = 0; i < num_fmts; i++) {
+               if (bitstream == (formats[i].codec_mode !=
+                                 HANTRO_MODE_NONE))
+                       return &formats[i];
+       }
+       return NULL;
+}
+
+static int vidioc_querycap(struct file *file, void *priv,
+                          struct v4l2_capability *cap)
+{
+       struct hantro_dev *vpu = video_drvdata(file);
+       struct video_device *vdev = video_devdata(file);
+
+       strscpy(cap->driver, vpu->dev->driver->name, sizeof(cap->driver));
+       strscpy(cap->card, vdev->name, sizeof(cap->card));
+       snprintf(cap->bus_info, sizeof(cap->bus_info), "platform: %s",
+                vpu->dev->driver->name);
+       return 0;
+}
+
+static int vidioc_enum_framesizes(struct file *file, void *priv,
+                                 struct v4l2_frmsizeenum *fsize)
+{
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+       const struct hantro_fmt *formats, *fmt;
+       unsigned int num_fmts;
+
+       if (fsize->index != 0) {
+               vpu_debug(0, "invalid frame size index (expected 0, got %d)\n",
+                         fsize->index);
+               return -EINVAL;
+       }
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       fmt = hantro_find_format(formats, num_fmts, fsize->pixel_format);
+       if (!fmt) {
+               vpu_debug(0, "unsupported bitstream format (%08x)\n",
+                         fsize->pixel_format);
+               return -EINVAL;
+       }
+
+       /* This only makes sense for coded formats */
+       if (fmt->codec_mode == HANTRO_MODE_NONE)
+               return -EINVAL;
+
+       fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
+       fsize->stepwise = fmt->frmsize;
+
+       return 0;
+}
+
+static int vidioc_enum_fmt(struct file *file, void *priv,
+                          struct v4l2_fmtdesc *f, bool capture)
+
+{
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+       const struct hantro_fmt *fmt, *formats;
+       unsigned int num_fmts, i, j = 0;
+       bool skip_mode_none;
+
+       /*
+        * When dealing with an encoder:
+        *  - on the capture side we want to filter out all MODE_NONE formats.
+        *  - on the output side we want to filter out all formats that are
+        *    not MODE_NONE.
+        * When dealing with a decoder:
+        *  - on the capture side we want to filter out all formats that are
+        *    not MODE_NONE.
+        *  - on the output side we want to filter out all MODE_NONE formats.
+        */
+       skip_mode_none = capture == hantro_is_encoder_ctx(ctx);
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       for (i = 0; i < num_fmts; i++) {
+               bool mode_none = formats[i].codec_mode == HANTRO_MODE_NONE;
+
+               if (skip_mode_none == mode_none)
+                       continue;
+               if (j == f->index) {
+                       fmt = &formats[i];
+                       f->pixelformat = fmt->fourcc;
+                       return 0;
+               }
+               ++j;
+       }
+       return -EINVAL;
+}
+
+static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
+                                  struct v4l2_fmtdesc *f)
+{
+       return vidioc_enum_fmt(file, priv, f, true);
+}
+
+static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
+                                  struct v4l2_fmtdesc *f)
+{
+       return vidioc_enum_fmt(file, priv, f, false);
+}
+
+static int vidioc_g_fmt_out_mplane(struct file *file, void *priv,
+                                  struct v4l2_format *f)
+{
+       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+
+       vpu_debug(4, "f->type = %d\n", f->type);
+
+       *pix_mp = ctx->src_fmt;
+
+       return 0;
+}
+
+static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
+                                  struct v4l2_format *f)
+{
+       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+
+       vpu_debug(4, "f->type = %d\n", f->type);
+
+       *pix_mp = ctx->dst_fmt;
+
+       return 0;
+}
+
+static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f,
+                         bool capture)
+{
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
+       const struct hantro_fmt *formats, *fmt, *vpu_fmt;
+       unsigned int num_fmts;
+       bool coded;
+
+       coded = capture == hantro_is_encoder_ctx(ctx);
+
+       vpu_debug(4, "trying format %c%c%c%c\n",
+                 (pix_mp->pixelformat & 0x7f),
+                 (pix_mp->pixelformat >> 8) & 0x7f,
+                 (pix_mp->pixelformat >> 16) & 0x7f,
+                 (pix_mp->pixelformat >> 24) & 0x7f);
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       fmt = hantro_find_format(formats, num_fmts, pix_mp->pixelformat);
+       if (!fmt) {
+               fmt = hantro_get_default_fmt(formats, num_fmts, coded);
+               f->fmt.pix_mp.pixelformat = fmt->fourcc;
+       }
+
+       if (coded) {
+               pix_mp->num_planes = 1;
+               vpu_fmt = fmt;
+       } else if (hantro_is_encoder_ctx(ctx)) {
+               vpu_fmt = ctx->vpu_dst_fmt;
+       } else {
+               vpu_fmt = ctx->vpu_src_fmt;
+               /*
+                * Width/height on the CAPTURE end of a decoder are ignored and
+                * replaced by the OUTPUT ones.
+                */
+               pix_mp->width = ctx->src_fmt.width;
+               pix_mp->height = ctx->src_fmt.height;
+       }
+
+       pix_mp->field = V4L2_FIELD_NONE;
+
+       v4l2_apply_frmsize_constraints(&pix_mp->width, &pix_mp->height,
+                                      &vpu_fmt->frmsize);
+
+       if (!coded) {
+               /* Fill remaining fields */
+               v4l2_fill_pixfmt_mp(pix_mp, fmt->fourcc, pix_mp->width,
+                                   pix_mp->height);
+       } else if (!pix_mp->plane_fmt[0].sizeimage) {
+               /*
+                * For coded formats the application can specify
+                * sizeimage. If the application passes a zero sizeimage,
+                * let's default to the maximum frame size.
+                */
+               pix_mp->plane_fmt[0].sizeimage = fmt->header_size +
+                       pix_mp->width * pix_mp->height * fmt->max_depth;
+       }
+
+       return 0;
+}
+
+static int vidioc_try_fmt_cap_mplane(struct file *file, void *priv,
+                                    struct v4l2_format *f)
+{
+       return vidioc_try_fmt(file, priv, f, true);
+}
+
+static int vidioc_try_fmt_out_mplane(struct file *file, void *priv,
+                                    struct v4l2_format *f)
+{
+       return vidioc_try_fmt(file, priv, f, false);
+}
+
+static void
+hantro_reset_fmt(struct v4l2_pix_format_mplane *fmt,
+                const struct hantro_fmt *vpu_fmt)
+{
+       memset(fmt, 0, sizeof(*fmt));
+
+       fmt->pixelformat = vpu_fmt->fourcc;
+       fmt->field = V4L2_FIELD_NONE;
+       fmt->colorspace = V4L2_COLORSPACE_JPEG,
+       fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
+       fmt->quantization = V4L2_QUANTIZATION_DEFAULT;
+       fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;
+}
+
+static void
+hantro_reset_encoded_fmt(struct hantro_ctx *ctx)
+{
+       const struct hantro_fmt *vpu_fmt, *formats;
+       struct v4l2_pix_format_mplane *fmt;
+       unsigned int num_fmts;
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       vpu_fmt = hantro_get_default_fmt(formats, num_fmts, true);
+
+       if (hantro_is_encoder_ctx(ctx)) {
+               ctx->vpu_dst_fmt = vpu_fmt;
+               fmt = &ctx->dst_fmt;
+       } else {
+               ctx->vpu_src_fmt = vpu_fmt;
+               fmt = &ctx->src_fmt;
+       }
+
+       hantro_reset_fmt(fmt, vpu_fmt);
+       fmt->num_planes = 1;
+       fmt->width = vpu_fmt->frmsize.min_width;
+       fmt->height = vpu_fmt->frmsize.min_height;
+       fmt->plane_fmt[0].sizeimage = vpu_fmt->header_size +
+                               fmt->width * fmt->height * vpu_fmt->max_depth;
+}
+
+static void
+hantro_reset_raw_fmt(struct hantro_ctx *ctx)
+{
+       const struct hantro_fmt *raw_vpu_fmt, *formats;
+       struct v4l2_pix_format_mplane *raw_fmt, *encoded_fmt;
+       unsigned int num_fmts;
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       raw_vpu_fmt = hantro_get_default_fmt(formats, num_fmts, false);
+
+       if (hantro_is_encoder_ctx(ctx)) {
+               ctx->vpu_src_fmt = raw_vpu_fmt;
+               raw_fmt = &ctx->src_fmt;
+               encoded_fmt = &ctx->dst_fmt;
+       } else {
+               ctx->vpu_dst_fmt = raw_vpu_fmt;
+               raw_fmt = &ctx->dst_fmt;
+               encoded_fmt = &ctx->src_fmt;
+       }
+
+       hantro_reset_fmt(raw_fmt, raw_vpu_fmt);
+       v4l2_fill_pixfmt_mp(raw_fmt, raw_vpu_fmt->fourcc,
+                           encoded_fmt->width,
+                           encoded_fmt->height);
+}
+
+void hantro_reset_fmts(struct hantro_ctx *ctx)
+{
+       hantro_reset_encoded_fmt(ctx);
+       hantro_reset_raw_fmt(ctx);
+}
+
+static void
+hantro_update_requires_request(struct hantro_ctx *ctx, u32 fourcc)
+{
+       switch (fourcc) {
+       case V4L2_PIX_FMT_JPEG:
+               ctx->fh.m2m_ctx->out_q_ctx.q.requires_requests = false;
+               break;
+       case V4L2_PIX_FMT_MPEG2_SLICE:
+               ctx->fh.m2m_ctx->out_q_ctx.q.requires_requests = true;
+               break;
+       default:
+               break;
+       }
+}
+
+static int
+vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f)
+{
+       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+       const struct hantro_fmt *formats;
+       unsigned int num_fmts;
+       struct vb2_queue *vq;
+       int ret;
+
+       /* Change not allowed if queue is busy. */
+       vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
+       if (vb2_is_busy(vq))
+               return -EBUSY;
+
+       if (!hantro_is_encoder_ctx(ctx)) {
+               struct vb2_queue *peer_vq;
+
+               /*
+                * Since format change on the OUTPUT queue will reset
+                * the CAPTURE queue, we can't allow doing so
+                * when the CAPTURE queue has buffers allocated.
+                */
+               peer_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
+                                         V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
+               if (vb2_is_busy(peer_vq))
+                       return -EBUSY;
+       }
+
+       ret = vidioc_try_fmt_out_mplane(file, priv, f);
+       if (ret)
+               return ret;
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       ctx->vpu_src_fmt = hantro_find_format(formats, num_fmts,
+                                             pix_mp->pixelformat);
+       ctx->src_fmt = *pix_mp;
+
+       /*
+        * Current raw format might have become invalid with newly
+        * selected codec, so reset it to default just to be safe and
+        * keep internal driver state sane. User is mandated to set
+        * the raw format again after we return, so we don't need
+        * anything smarter.
+        * Note that hantro_reset_raw_fmt() also propagates size
+        * changes to the raw format.
+        */
+       if (!hantro_is_encoder_ctx(ctx))
+               hantro_reset_raw_fmt(ctx);
+
+       /* Colorimetry information are always propagated. */
+       ctx->dst_fmt.colorspace = pix_mp->colorspace;
+       ctx->dst_fmt.ycbcr_enc = pix_mp->ycbcr_enc;
+       ctx->dst_fmt.xfer_func = pix_mp->xfer_func;
+       ctx->dst_fmt.quantization = pix_mp->quantization;
+
+       hantro_update_requires_request(ctx, pix_mp->pixelformat);
+
+       vpu_debug(0, "OUTPUT codec mode: %d\n", ctx->vpu_src_fmt->codec_mode);
+       vpu_debug(0, "fmt - w: %d, h: %d\n",
+                 pix_mp->width, pix_mp->height);
+       return 0;
+}
+
+static int vidioc_s_fmt_cap_mplane(struct file *file, void *priv,
+                                  struct v4l2_format *f)
+{
+       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
+       struct hantro_ctx *ctx = fh_to_ctx(priv);
+       const struct hantro_fmt *formats;
+       struct vb2_queue *vq;
+       unsigned int num_fmts;
+       int ret;
+
+       /* Change not allowed if queue is busy. */
+       vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
+       if (vb2_is_busy(vq))
+               return -EBUSY;
+
+       if (hantro_is_encoder_ctx(ctx)) {
+               struct vb2_queue *peer_vq;
+
+               /*
+                * Since format change on the CAPTURE queue will reset
+                * the OUTPUT queue, we can't allow doing so
+                * when the OUTPUT queue has buffers allocated.
+                */
+               peer_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
+                                         V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+               if (vb2_is_busy(peer_vq) &&
+                   (pix_mp->pixelformat != ctx->dst_fmt.pixelformat ||
+                    pix_mp->height != ctx->dst_fmt.height ||
+                    pix_mp->width != ctx->dst_fmt.width))
+                       return -EBUSY;
+       }
+
+       ret = vidioc_try_fmt_cap_mplane(file, priv, f);
+       if (ret)
+               return ret;
+
+       formats = hantro_get_formats(ctx, &num_fmts);
+       ctx->vpu_dst_fmt = hantro_find_format(formats, num_fmts,
+                                             pix_mp->pixelformat);
+       ctx->dst_fmt = *pix_mp;
+
+       /*
+        * Current raw format might have become invalid with newly
+        * selected codec, so reset it to default just to be safe and
+        * keep internal driver state sane. User is mandated to set
+        * the raw format again after we return, so we don't need
+        * anything smarter.
+        * Note that hantro_reset_raw_fmt() also propagates size
+        * changes to the raw format.
+        */
+       if (hantro_is_encoder_ctx(ctx))
+               hantro_reset_raw_fmt(ctx);
+
+       /* Colorimetry information are always propagated. */
+       ctx->src_fmt.colorspace = pix_mp->colorspace;
+       ctx->src_fmt.ycbcr_enc = pix_mp->ycbcr_enc;
+       ctx->src_fmt.xfer_func = pix_mp->xfer_func;
+       ctx->src_fmt.quantization = pix_mp->quantization;
+
+       vpu_debug(0, "CAPTURE codec mode: %d\n", ctx->vpu_dst_fmt->codec_mode);
+       vpu_debug(0, "fmt - w: %d, h: %d\n",
+                 pix_mp->width, pix_mp->height);
+
+       hantro_update_requires_request(ctx, pix_mp->pixelformat);
+
+       return 0;
+}
+
+const struct v4l2_ioctl_ops hantro_ioctl_ops = {
+       .vidioc_querycap = vidioc_querycap,
+       .vidioc_enum_framesizes = vidioc_enum_framesizes,
+
+       .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_cap_mplane,
+       .vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_out_mplane,
+       .vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_out_mplane,
+       .vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_cap_mplane,
+       .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_out_mplane,
+       .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_cap_mplane,
+       .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+
+       .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
+       .vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
+       .vidioc_qbuf = v4l2_m2m_ioctl_qbuf,
+       .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf,
+       .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
+       .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
+       .vidioc_expbuf = v4l2_m2m_ioctl_expbuf,
+
+       .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+       .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+
+       .vidioc_streamon = v4l2_m2m_ioctl_streamon,
+       .vidioc_streamoff = v4l2_m2m_ioctl_streamoff,
+};
+
+static int
+hantro_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
+                  unsigned int *num_planes, unsigned int sizes[],
+                  struct device *alloc_devs[])
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(vq);
+       struct v4l2_pix_format_mplane *pixfmt;
+       int i;
+
+       switch (vq->type) {
+       case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+               pixfmt = &ctx->dst_fmt;
+               break;
+       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+               pixfmt = &ctx->src_fmt;
+               break;
+       default:
+               vpu_err("invalid queue type: %d\n", vq->type);
+               return -EINVAL;
+       }
+
+       if (*num_planes) {
+               if (*num_planes != pixfmt->num_planes)
+                       return -EINVAL;
+               for (i = 0; i < pixfmt->num_planes; ++i)
+                       if (sizes[i] < pixfmt->plane_fmt[i].sizeimage)
+                               return -EINVAL;
+               return 0;
+       }
+
+       *num_planes = pixfmt->num_planes;
+       for (i = 0; i < pixfmt->num_planes; ++i)
+               sizes[i] = pixfmt->plane_fmt[i].sizeimage;
+       return 0;
+}
+
+static int
+hantro_buf_plane_check(struct vb2_buffer *vb, const struct hantro_fmt *vpu_fmt,
+                      struct v4l2_pix_format_mplane *pixfmt)
+{
+       unsigned int sz;
+       int i;
+
+       for (i = 0; i < pixfmt->num_planes; ++i) {
+               sz = pixfmt->plane_fmt[i].sizeimage;
+               vpu_debug(4, "plane %d size: %ld, sizeimage: %u\n",
+                         i, vb2_plane_size(vb, i), sz);
+               if (vb2_plane_size(vb, i) < sz) {
+                       vpu_err("plane %d is too small for output\n", i);
+                       return -EINVAL;
+               }
+       }
+       return 0;
+}
+
+static int hantro_buf_prepare(struct vb2_buffer *vb)
+{
+       struct vb2_queue *vq = vb->vb2_queue;
+       struct hantro_ctx *ctx = vb2_get_drv_priv(vq);
+
+       if (V4L2_TYPE_IS_OUTPUT(vq->type))
+               return hantro_buf_plane_check(vb, ctx->vpu_src_fmt,
+                                                 &ctx->src_fmt);
+
+       return hantro_buf_plane_check(vb, ctx->vpu_dst_fmt, &ctx->dst_fmt);
+}
+
+static void hantro_buf_queue(struct vb2_buffer *vb)
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+
+       v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
+}
+
+static bool hantro_vq_is_coded(struct vb2_queue *q)
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(q);
+
+       return hantro_is_encoder_ctx(ctx) != V4L2_TYPE_IS_OUTPUT(q->type);
+}
+
+static int hantro_start_streaming(struct vb2_queue *q, unsigned int count)
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(q);
+       int ret = 0;
+
+       if (V4L2_TYPE_IS_OUTPUT(q->type))
+               ctx->sequence_out = 0;
+       else
+               ctx->sequence_cap = 0;
+
+       if (hantro_vq_is_coded(q)) {
+               enum hantro_codec_mode codec_mode;
+
+               if (V4L2_TYPE_IS_OUTPUT(q->type))
+                       codec_mode = ctx->vpu_src_fmt->codec_mode;
+               else
+                       codec_mode = ctx->vpu_dst_fmt->codec_mode;
+
+               vpu_debug(4, "Codec mode = %d\n", codec_mode);
+               ctx->codec_ops = &ctx->dev->variant->codec_ops[codec_mode];
+               if (ctx->codec_ops && ctx->codec_ops->init)
+                       ret = ctx->codec_ops->init(ctx);
+       }
+
+       return ret;
+}
+
+static void
+hantro_return_bufs(struct vb2_queue *q,
+                  struct vb2_v4l2_buffer *(*buf_remove)(struct v4l2_m2m_ctx *))
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(q);
+
+       for (;;) {
+               struct vb2_v4l2_buffer *vbuf;
+
+               vbuf = buf_remove(ctx->fh.m2m_ctx);
+               if (!vbuf)
+                       break;
+               v4l2_ctrl_request_complete(vbuf->vb2_buf.req_obj.req,
+                                          &ctx->ctrl_handler);
+               v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
+       }
+}
+
+static void hantro_stop_streaming(struct vb2_queue *q)
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(q);
+
+       if (hantro_vq_is_coded(q)) {
+               if (ctx->codec_ops && ctx->codec_ops->exit)
+                       ctx->codec_ops->exit(ctx);
+       }
+
+       /*
+        * The mem2mem framework calls v4l2_m2m_cancel_job before
+        * .stop_streaming, so there isn't any job running and
+        * it is safe to return all the buffers.
+        */
+       if (V4L2_TYPE_IS_OUTPUT(q->type))
+               hantro_return_bufs(q, v4l2_m2m_src_buf_remove);
+       else
+               hantro_return_bufs(q, v4l2_m2m_dst_buf_remove);
+}
+
+static void hantro_buf_request_complete(struct vb2_buffer *vb)
+{
+       struct hantro_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+
+       v4l2_ctrl_request_complete(vb->req_obj.req, &ctx->ctrl_handler);
+}
+
+static int hantro_buf_out_validate(struct vb2_buffer *vb)
+{
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+
+       vbuf->field = V4L2_FIELD_NONE;
+       return 0;
+}
+
+const struct vb2_ops hantro_queue_ops = {
+       .queue_setup = hantro_queue_setup,
+       .buf_prepare = hantro_buf_prepare,
+       .buf_queue = hantro_buf_queue,
+       .buf_out_validate = hantro_buf_out_validate,
+       .buf_request_complete = hantro_buf_request_complete,
+       .start_streaming = hantro_start_streaming,
+       .stop_streaming = hantro_stop_streaming,
+       .wait_prepare = vb2_ops_wait_prepare,
+       .wait_finish = vb2_ops_wait_finish,
+};
diff --git a/drivers/staging/media/hantro/hantro_v4l2.h b/drivers/staging/media/hantro/hantro_v4l2.h
new file mode 100644 (file)
index 0000000..18bc682
--- /dev/null
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ *     Alpha Lin <Alpha.Lin@rock-chips.com>
+ *     Jeffy Chen <jeffy.chen@rock-chips.com>
+ *
+ * Copyright 2018 Google LLC.
+ *     Tomasz Figa <tfiga@chromium.org>
+ *
+ * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.
+ */
+
+#ifndef HANTRO_V4L2_H_
+#define HANTRO_V4L2_H_
+
+#include "hantro.h"
+
+extern const struct v4l2_ioctl_ops hantro_ioctl_ops;
+extern const struct vb2_ops hantro_queue_ops;
+
+void hantro_reset_fmts(struct hantro_ctx *ctx);
+
+#endif /* HANTRO_V4L2_H_ */
diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c
new file mode 100644 (file)
index 0000000..f0d3f0e
--- /dev/null
@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ *     Jeffy Chen <jeffy.chen@rock-chips.com>
+ */
+
+#include <linux/clk.h>
+
+#include "hantro.h"
+#include "hantro_jpeg.h"
+#include "hantro_g1_regs.h"
+#include "hantro_h1_regs.h"
+
+#define RK3288_ACLK_MAX_FREQ (400 * 1000 * 1000)
+
+/*
+ * Supported formats.
+ */
+
+static const struct hantro_fmt rk3288_vpu_enc_fmts[] = {
+       {
+               .fourcc = V4L2_PIX_FMT_YUV420M,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420P,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV12M,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420SP,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_YUYV,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_YUYV422,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_UYVY,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_UYVY422,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_JPEG,
+               .codec_mode = HANTRO_MODE_JPEG_ENC,
+               .max_depth = 2,
+               .header_size = JPEG_HEADER_SIZE,
+               .frmsize = {
+                       .min_width = 96,
+                       .max_width = 8192,
+                       .step_width = JPEG_MB_DIM,
+                       .min_height = 32,
+                       .max_height = 8192,
+                       .step_height = JPEG_MB_DIM,
+               },
+       },
+};
+
+static const struct hantro_fmt rk3288_vpu_dec_fmts[] = {
+       {
+               .fourcc = V4L2_PIX_FMT_NV12,
+               .codec_mode = HANTRO_MODE_NONE,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
+               .codec_mode = HANTRO_MODE_MPEG2_DEC,
+               .max_depth = 2,
+               .frmsize = {
+                       .min_width = 48,
+                       .max_width = 1920,
+                       .step_width = MPEG2_MB_DIM,
+                       .min_height = 48,
+                       .max_height = 1088,
+                       .step_height = MPEG2_MB_DIM,
+               },
+       },
+};
+
+static irqreturn_t rk3288_vepu_irq(int irq, void *dev_id)
+{
+       struct hantro_dev *vpu = dev_id;
+       enum vb2_buffer_state state;
+       u32 status, bytesused;
+
+       status = vepu_read(vpu, H1_REG_INTERRUPT);
+       bytesused = vepu_read(vpu, H1_REG_STR_BUF_LIMIT) / 8;
+       state = (status & H1_REG_INTERRUPT_FRAME_RDY) ?
+               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
+
+       vepu_write(vpu, 0, H1_REG_INTERRUPT);
+       vepu_write(vpu, 0, H1_REG_AXI_CTRL);
+
+       hantro_irq_done(vpu, bytesused, state);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t rk3288_vdpu_irq(int irq, void *dev_id)
+{
+       struct hantro_dev *vpu = dev_id;
+       enum vb2_buffer_state state;
+       u32 status;
+
+       status = vdpu_read(vpu, G1_REG_INTERRUPT);
+       state = (status & G1_REG_INTERRUPT_DEC_RDY_INT) ?
+               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
+
+       vdpu_write(vpu, 0, G1_REG_INTERRUPT);
+       vdpu_write(vpu, G1_REG_CONFIG_DEC_CLK_GATE_E, G1_REG_CONFIG);
+
+       hantro_irq_done(vpu, 0, state);
+
+       return IRQ_HANDLED;
+}
+
+static int rk3288_vpu_hw_init(struct hantro_dev *vpu)
+{
+       /* Bump ACLK to max. possible freq. to improve performance. */
+       clk_set_rate(vpu->clocks[0].clk, RK3288_ACLK_MAX_FREQ);
+       return 0;
+}
+
+static void rk3288_vpu_enc_reset(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+
+       vepu_write(vpu, H1_REG_INTERRUPT_DIS_BIT, H1_REG_INTERRUPT);
+       vepu_write(vpu, 0, H1_REG_ENC_CTRL);
+       vepu_write(vpu, 0, H1_REG_AXI_CTRL);
+}
+
+static void rk3288_vpu_dec_reset(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+
+       vdpu_write(vpu, G1_REG_INTERRUPT_DEC_IRQ_DIS, G1_REG_INTERRUPT);
+       vdpu_write(vpu, G1_REG_CONFIG_DEC_CLK_GATE_E, G1_REG_CONFIG);
+       vdpu_write(vpu, 1, G1_REG_SOFT_RESET);
+}
+
+/*
+ * Supported codec ops.
+ */
+
+static const struct hantro_codec_ops rk3288_vpu_codec_ops[] = {
+       [HANTRO_MODE_JPEG_ENC] = {
+               .run = hantro_h1_jpeg_enc_run,
+               .reset = rk3288_vpu_enc_reset,
+               .init = hantro_jpeg_enc_init,
+               .exit = hantro_jpeg_enc_exit,
+       },
+       [HANTRO_MODE_MPEG2_DEC] = {
+               .run = hantro_g1_mpeg2_dec_run,
+               .reset = rk3288_vpu_dec_reset,
+               .init = hantro_mpeg2_dec_init,
+               .exit = hantro_mpeg2_dec_exit,
+       },
+};
+
+/*
+ * VPU variant.
+ */
+
+const struct hantro_variant rk3288_vpu_variant = {
+       .enc_offset = 0x0,
+       .enc_fmts = rk3288_vpu_enc_fmts,
+       .num_enc_fmts = ARRAY_SIZE(rk3288_vpu_enc_fmts),
+       .dec_offset = 0x400,
+       .dec_fmts = rk3288_vpu_dec_fmts,
+       .num_dec_fmts = ARRAY_SIZE(rk3288_vpu_dec_fmts),
+       .codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER,
+       .codec_ops = rk3288_vpu_codec_ops,
+       .vepu_irq = rk3288_vepu_irq,
+       .vdpu_irq = rk3288_vdpu_irq,
+       .init = rk3288_vpu_hw_init,
+       .clk_names = {"aclk", "hclk"},
+       .num_clocks = 2
+};
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw.c b/drivers/staging/media/hantro/rk3399_vpu_hw.c
new file mode 100644 (file)
index 0000000..0a43e07
--- /dev/null
@@ -0,0 +1,177 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ *     Jeffy Chen <jeffy.chen@rock-chips.com>
+ */
+
+#include <linux/clk.h>
+
+#include "hantro.h"
+#include "hantro_jpeg.h"
+#include "rk3399_vpu_regs.h"
+
+#define RK3399_ACLK_MAX_FREQ (400 * 1000 * 1000)
+
+/*
+ * Supported formats.
+ */
+
+static const struct hantro_fmt rk3399_vpu_enc_fmts[] = {
+       {
+               .fourcc = V4L2_PIX_FMT_YUV420M,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420P,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_NV12M,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420SP,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_YUYV,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_YUYV422,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_UYVY,
+               .codec_mode = HANTRO_MODE_NONE,
+               .enc_fmt = RK3288_VPU_ENC_FMT_UYVY422,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_JPEG,
+               .codec_mode = HANTRO_MODE_JPEG_ENC,
+               .max_depth = 2,
+               .header_size = JPEG_HEADER_SIZE,
+               .frmsize = {
+                       .min_width = 96,
+                       .max_width = 8192,
+                       .step_width = JPEG_MB_DIM,
+                       .min_height = 32,
+                       .max_height = 8192,
+                       .step_height = JPEG_MB_DIM,
+               },
+       },
+};
+
+static const struct hantro_fmt rk3399_vpu_dec_fmts[] = {
+       {
+               .fourcc = V4L2_PIX_FMT_NV12,
+               .codec_mode = HANTRO_MODE_NONE,
+       },
+       {
+               .fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
+               .codec_mode = HANTRO_MODE_MPEG2_DEC,
+               .max_depth = 2,
+               .frmsize = {
+                       .min_width = 48,
+                       .max_width = 1920,
+                       .step_width = MPEG2_MB_DIM,
+                       .min_height = 48,
+                       .max_height = 1088,
+                       .step_height = MPEG2_MB_DIM,
+               },
+       },
+};
+
+static irqreturn_t rk3399_vepu_irq(int irq, void *dev_id)
+{
+       struct hantro_dev *vpu = dev_id;
+       enum vb2_buffer_state state;
+       u32 status, bytesused;
+
+       status = vepu_read(vpu, VEPU_REG_INTERRUPT);
+       bytesused = vepu_read(vpu, VEPU_REG_STR_BUF_LIMIT) / 8;
+       state = (status & VEPU_REG_INTERRUPT_FRAME_READY) ?
+               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
+
+       vepu_write(vpu, 0, VEPU_REG_INTERRUPT);
+       vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);
+
+       hantro_irq_done(vpu, bytesused, state);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t rk3399_vdpu_irq(int irq, void *dev_id)
+{
+       struct hantro_dev *vpu = dev_id;
+       enum vb2_buffer_state state;
+       u32 status;
+
+       status = vdpu_read(vpu, VDPU_REG_INTERRUPT);
+       state = (status & VDPU_REG_INTERRUPT_DEC_IRQ) ?
+               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
+
+       vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);
+       vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL);
+
+       hantro_irq_done(vpu, 0, state);
+
+       return IRQ_HANDLED;
+}
+
+static int rk3399_vpu_hw_init(struct hantro_dev *vpu)
+{
+       /* Bump ACLK to max. possible freq. to improve performance. */
+       clk_set_rate(vpu->clocks[0].clk, RK3399_ACLK_MAX_FREQ);
+       return 0;
+}
+
+static void rk3399_vpu_enc_reset(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+
+       vepu_write(vpu, VEPU_REG_INTERRUPT_DIS_BIT, VEPU_REG_INTERRUPT);
+       vepu_write(vpu, 0, VEPU_REG_ENCODE_START);
+       vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);
+}
+
+static void rk3399_vpu_dec_reset(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+
+       vdpu_write(vpu, VDPU_REG_INTERRUPT_DEC_IRQ_DIS, VDPU_REG_INTERRUPT);
+       vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS);
+       vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET);
+}
+
+/*
+ * Supported codec ops.
+ */
+
+static const struct hantro_codec_ops rk3399_vpu_codec_ops[] = {
+       [HANTRO_MODE_JPEG_ENC] = {
+               .run = rk3399_vpu_jpeg_enc_run,
+               .reset = rk3399_vpu_enc_reset,
+               .init = hantro_jpeg_enc_init,
+               .exit = hantro_jpeg_enc_exit,
+       },
+       [HANTRO_MODE_MPEG2_DEC] = {
+               .run = rk3399_vpu_mpeg2_dec_run,
+               .reset = rk3399_vpu_dec_reset,
+               .init = hantro_mpeg2_dec_init,
+               .exit = hantro_mpeg2_dec_exit,
+       },
+};
+
+/*
+ * VPU variant.
+ */
+
+const struct hantro_variant rk3399_vpu_variant = {
+       .enc_offset = 0x0,
+       .enc_fmts = rk3399_vpu_enc_fmts,
+       .num_enc_fmts = ARRAY_SIZE(rk3399_vpu_enc_fmts),
+       .dec_offset = 0x400,
+       .dec_fmts = rk3399_vpu_dec_fmts,
+       .num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts),
+       .codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER,
+       .codec_ops = rk3399_vpu_codec_ops,
+       .vepu_irq = rk3399_vepu_irq,
+       .vdpu_irq = rk3399_vdpu_irq,
+       .init = rk3399_vpu_hw_init,
+       .clk_names = {"aclk", "hclk"},
+       .num_clocks = 2
+};
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c
new file mode 100644 (file)
index 0000000..ae66354
--- /dev/null
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ *
+ * JPEG encoder
+ * ------------
+ * The VPU JPEG encoder produces JPEG baseline sequential format.
+ * The quantization coefficients are 8-bit values, complying with
+ * the baseline specification. Therefore, it requires
+ * luma and chroma quantization tables. The hardware does entropy
+ * encoding using internal Huffman tables, as specified in the JPEG
+ * specification.
+ *
+ * In other words, only the luma and chroma quantization tables are
+ * required for the encoding operation.
+ *
+ * Quantization luma table values are written to registers
+ * VEPU_swreg_0-VEPU_swreg_15, and chroma table values to
+ * VEPU_swreg_16-VEPU_swreg_31.
+ *
+ * JPEG zigzag order is expected on the quantization tables.
+ */
+
+#include <asm/unaligned.h>
+#include <media/v4l2-mem2mem.h>
+#include "hantro_jpeg.h"
+#include "hantro.h"
+#include "hantro_v4l2.h"
+#include "hantro_hw.h"
+#include "rk3399_vpu_regs.h"
+
+#define VEPU_JPEG_QUANT_TABLE_COUNT 16
+
+static void rk3399_vpu_set_src_img_ctrl(struct hantro_dev *vpu,
+                                       struct hantro_ctx *ctx)
+{
+       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
+       u32 reg;
+
+       /*
+        * The pix fmt width/height are already macroblock aligned
+        * by .vidioc_s_fmt_vid_cap_mplane() callback
+        */
+       reg = VEPU_REG_IN_IMG_CTRL_ROW_LEN(pix_fmt->width);
+       vepu_write_relaxed(vpu, reg, VEPU_REG_INPUT_LUMA_INFO);
+
+       reg = VEPU_REG_IN_IMG_CTRL_OVRFLR_D4(0) |
+             VEPU_REG_IN_IMG_CTRL_OVRFLB(0);
+       /*
+        * This register controls the input crop, as the offset
+        * from the right/bottom within the last macroblock. The offset from the
+        * right must be divided by 4 and so the crop must be aligned to 4 pixels
+        * horizontally.
+        */
+       vepu_write_relaxed(vpu, reg, VEPU_REG_ENC_OVER_FILL_STRM_OFFSET);
+
+       reg = VEPU_REG_IN_IMG_CTRL_FMT(ctx->vpu_src_fmt->enc_fmt);
+       vepu_write_relaxed(vpu, reg, VEPU_REG_ENC_CTRL1);
+}
+
+static void rk3399_vpu_jpeg_enc_set_buffers(struct hantro_dev *vpu,
+                                           struct hantro_ctx *ctx,
+                                           struct vb2_buffer *src_buf)
+{
+       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
+       dma_addr_t src[3];
+
+       WARN_ON(pix_fmt->num_planes > 3);
+
+       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.dma,
+                          VEPU_REG_ADDR_OUTPUT_STREAM);
+       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.size,
+                          VEPU_REG_STR_BUF_LIMIT);
+
+       if (pix_fmt->num_planes == 1) {
+               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
+       } else if (pix_fmt->num_planes == 2) {
+               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
+               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
+               vepu_write_relaxed(vpu, src[1], VEPU_REG_ADDR_IN_PLANE_1);
+       } else {
+               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
+               src[2] = vb2_dma_contig_plane_dma_addr(src_buf, 2);
+               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
+               vepu_write_relaxed(vpu, src[1], VEPU_REG_ADDR_IN_PLANE_1);
+               vepu_write_relaxed(vpu, src[2], VEPU_REG_ADDR_IN_PLANE_2);
+       }
+}
+
+static void
+rk3399_vpu_jpeg_enc_set_qtable(struct hantro_dev *vpu,
+                              unsigned char *luma_qtable,
+                              unsigned char *chroma_qtable)
+{
+       u32 reg, i;
+
+       for (i = 0; i < VEPU_JPEG_QUANT_TABLE_COUNT; i++) {
+               reg = get_unaligned_be32(&luma_qtable[i]);
+               vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_LUMA_QUAT(i));
+
+               reg = get_unaligned_be32(&chroma_qtable[i]);
+               vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_CHROMA_QUAT(i));
+       }
+}
+
+void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *src_buf, *dst_buf;
+       struct hantro_jpeg_ctx jpeg_ctx;
+       struct media_request *src_req;
+       u32 reg;
+
+       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+
+       src_req = src_buf->vb2_buf.req_obj.req;
+       v4l2_ctrl_request_setup(src_req, &ctx->ctrl_handler);
+
+       memset(&jpeg_ctx, 0, sizeof(jpeg_ctx));
+       jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
+       jpeg_ctx.width = ctx->dst_fmt.width;
+       jpeg_ctx.height = ctx->dst_fmt.height;
+       jpeg_ctx.quality = ctx->jpeg_quality;
+       hantro_jpeg_header_assemble(&jpeg_ctx);
+
+       /* Switch to JPEG encoder mode before writing registers */
+       vepu_write_relaxed(vpu, VEPU_REG_ENCODE_FORMAT_JPEG,
+                          VEPU_REG_ENCODE_START);
+
+       rk3399_vpu_set_src_img_ctrl(vpu, ctx);
+       rk3399_vpu_jpeg_enc_set_buffers(vpu, ctx, &src_buf->vb2_buf);
+       rk3399_vpu_jpeg_enc_set_qtable(vpu,
+                                      hantro_jpeg_get_qtable(&jpeg_ctx, 0),
+                                      hantro_jpeg_get_qtable(&jpeg_ctx, 1));
+
+       reg = VEPU_REG_OUTPUT_SWAP32
+               | VEPU_REG_OUTPUT_SWAP16
+               | VEPU_REG_OUTPUT_SWAP8
+               | VEPU_REG_INPUT_SWAP8
+               | VEPU_REG_INPUT_SWAP16
+               | VEPU_REG_INPUT_SWAP32;
+       /* Make sure that all registers are written at this point. */
+       vepu_write(vpu, reg, VEPU_REG_DATA_ENDIAN);
+
+       reg = VEPU_REG_AXI_CTRL_BURST_LEN(16);
+       vepu_write_relaxed(vpu, reg, VEPU_REG_AXI_CTRL);
+
+       reg = VEPU_REG_MB_WIDTH(JPEG_MB_WIDTH(ctx->src_fmt.width))
+               | VEPU_REG_MB_HEIGHT(JPEG_MB_HEIGHT(ctx->src_fmt.height))
+               | VEPU_REG_FRAME_TYPE_INTRA
+               | VEPU_REG_ENCODE_FORMAT_JPEG
+               | VEPU_REG_ENCODE_ENABLE;
+
+       v4l2_ctrl_request_complete(src_req, &ctx->ctrl_handler);
+
+       /* Kick the watchdog and start encoding */
+       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
+       vepu_write(vpu, reg, VEPU_REG_ENCODE_START);
+}
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
new file mode 100644 (file)
index 0000000..8685bdd
--- /dev/null
@@ -0,0 +1,266 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ */
+
+#include <asm/unaligned.h>
+#include <linux/bitfield.h>
+#include <media/v4l2-mem2mem.h>
+#include "hantro.h"
+#include "hantro_hw.h"
+
+#define VDPU_SWREG(nr)                 ((nr) * 4)
+
+#define VDPU_REG_DEC_OUT_BASE          VDPU_SWREG(63)
+#define VDPU_REG_RLC_VLC_BASE          VDPU_SWREG(64)
+#define VDPU_REG_QTABLE_BASE           VDPU_SWREG(61)
+#define VDPU_REG_REFER0_BASE           VDPU_SWREG(131)
+#define VDPU_REG_REFER2_BASE           VDPU_SWREG(134)
+#define VDPU_REG_REFER3_BASE           VDPU_SWREG(135)
+#define VDPU_REG_REFER1_BASE           VDPU_SWREG(148)
+#define VDPU_REG_DEC_E(v)              ((v) ? BIT(0) : 0)
+
+#define VDPU_REG_DEC_ADV_PRE_DIS(v)    ((v) ? BIT(11) : 0)
+#define VDPU_REG_DEC_SCMD_DIS(v)       ((v) ? BIT(10) : 0)
+#define VDPU_REG_FILTERING_DIS(v)      ((v) ? BIT(8) : 0)
+#define VDPU_REG_DEC_LATENCY(v)                (((v) << 1) & GENMASK(6, 1))
+
+#define VDPU_REG_INIT_QP(v)            (((v) << 25) & GENMASK(30, 25))
+#define VDPU_REG_STREAM_LEN(v)         (((v) << 0) & GENMASK(23, 0))
+
+#define VDPU_REG_APF_THRESHOLD(v)      (((v) << 17) & GENMASK(30, 17))
+#define VDPU_REG_STARTMB_X(v)          (((v) << 8) & GENMASK(16, 8))
+#define VDPU_REG_STARTMB_Y(v)          (((v) << 0) & GENMASK(7, 0))
+
+#define VDPU_REG_DEC_MODE(v)           (((v) << 0) & GENMASK(3, 0))
+
+#define VDPU_REG_DEC_STRENDIAN_E(v)    ((v) ? BIT(5) : 0)
+#define VDPU_REG_DEC_STRSWAP32_E(v)    ((v) ? BIT(4) : 0)
+#define VDPU_REG_DEC_OUTSWAP32_E(v)    ((v) ? BIT(3) : 0)
+#define VDPU_REG_DEC_INSWAP32_E(v)     ((v) ? BIT(2) : 0)
+#define VDPU_REG_DEC_OUT_ENDIAN(v)     ((v) ? BIT(1) : 0)
+#define VDPU_REG_DEC_IN_ENDIAN(v)      ((v) ? BIT(0) : 0)
+
+#define VDPU_REG_DEC_DATA_DISC_E(v)    ((v) ? BIT(22) : 0)
+#define VDPU_REG_DEC_MAX_BURST(v)      (((v) << 16) & GENMASK(20, 16))
+#define VDPU_REG_DEC_AXI_WR_ID(v)      (((v) << 8) & GENMASK(15, 8))
+#define VDPU_REG_DEC_AXI_RD_ID(v)      (((v) << 0) & GENMASK(7, 0))
+
+#define VDPU_REG_RLC_MODE_E(v)         ((v) ? BIT(20) : 0)
+#define VDPU_REG_PIC_INTERLACE_E(v)    ((v) ? BIT(17) : 0)
+#define VDPU_REG_PIC_FIELDMODE_E(v)    ((v) ? BIT(16) : 0)
+#define VDPU_REG_PIC_B_E(v)            ((v) ? BIT(15) : 0)
+#define VDPU_REG_PIC_INTER_E(v)                ((v) ? BIT(14) : 0)
+#define VDPU_REG_PIC_TOPFIELD_E(v)     ((v) ? BIT(13) : 0)
+#define VDPU_REG_FWD_INTERLACE_E(v)    ((v) ? BIT(12) : 0)
+#define VDPU_REG_WRITE_MVS_E(v)                ((v) ? BIT(10) : 0)
+#define VDPU_REG_DEC_TIMEOUT_E(v)      ((v) ? BIT(5) : 0)
+#define VDPU_REG_DEC_CLK_GATE_E(v)     ((v) ? BIT(4) : 0)
+
+#define VDPU_REG_PIC_MB_WIDTH(v)       (((v) << 23) & GENMASK(31, 23))
+#define VDPU_REG_PIC_MB_HEIGHT_P(v)    (((v) << 11) & GENMASK(18, 11))
+#define VDPU_REG_ALT_SCAN_E(v)         ((v) ? BIT(6) : 0)
+#define VDPU_REG_TOPFIELDFIRST_E(v)    ((v) ? BIT(5) : 0)
+
+#define VDPU_REG_STRM_START_BIT(v)     (((v) << 26) & GENMASK(31, 26))
+#define VDPU_REG_QSCALE_TYPE(v)                ((v) ? BIT(24) : 0)
+#define VDPU_REG_CON_MV_E(v)           ((v) ? BIT(4) : 0)
+#define VDPU_REG_INTRA_DC_PREC(v)      (((v) << 2) & GENMASK(3, 2))
+#define VDPU_REG_INTRA_VLC_TAB(v)      ((v) ? BIT(1) : 0)
+#define VDPU_REG_FRAME_PRED_DCT(v)     ((v) ? BIT(0) : 0)
+
+#define VDPU_REG_ALT_SCAN_FLAG_E(v)    ((v) ? BIT(19) : 0)
+#define VDPU_REG_FCODE_FWD_HOR(v)      (((v) << 15) & GENMASK(18, 15))
+#define VDPU_REG_FCODE_FWD_VER(v)      (((v) << 11) & GENMASK(14, 11))
+#define VDPU_REG_FCODE_BWD_HOR(v)      (((v) << 7) & GENMASK(10, 7))
+#define VDPU_REG_FCODE_BWD_VER(v)      (((v) << 3) & GENMASK(6, 3))
+#define VDPU_REG_MV_ACCURACY_FWD(v)    ((v) ? BIT(2) : 0)
+#define VDPU_REG_MV_ACCURACY_BWD(v)    ((v) ? BIT(1) : 0)
+
+#define PICT_TOP_FIELD     1
+#define PICT_BOTTOM_FIELD  2
+#define PICT_FRAME         3
+
+static void
+rk3399_vpu_mpeg2_dec_set_quantization(struct hantro_dev *vpu,
+                                     struct hantro_ctx *ctx)
+{
+       struct v4l2_ctrl_mpeg2_quantization *quantization;
+
+       quantization = hantro_get_ctrl(ctx,
+                                      V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION);
+       hantro_mpeg2_dec_copy_qtable(ctx->mpeg2_dec.qtable.cpu, quantization);
+       vdpu_write_relaxed(vpu, ctx->mpeg2_dec.qtable.dma,
+                          VDPU_REG_QTABLE_BASE);
+}
+
+static void
+rk3399_vpu_mpeg2_dec_set_buffers(struct hantro_dev *vpu,
+                                struct hantro_ctx *ctx,
+                                struct vb2_buffer *src_buf,
+                                struct vb2_buffer *dst_buf,
+                                const struct v4l2_mpeg2_sequence *sequence,
+                                const struct v4l2_mpeg2_picture *picture,
+                                const struct v4l2_ctrl_mpeg2_slice_params *slice_params)
+{
+       dma_addr_t forward_addr = 0, backward_addr = 0;
+       dma_addr_t current_addr, addr;
+       struct vb2_queue *vq;
+
+       vq = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);
+
+       switch (picture->picture_coding_type) {
+       case V4L2_MPEG2_PICTURE_CODING_TYPE_B:
+               backward_addr = hantro_get_ref(vq,
+                                              slice_params->backward_ref_ts);
+               /* fall-through */
+       case V4L2_MPEG2_PICTURE_CODING_TYPE_P:
+               forward_addr = hantro_get_ref(vq,
+                                             slice_params->forward_ref_ts);
+       }
+
+       /* Source bitstream buffer */
+       addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+       vdpu_write_relaxed(vpu, addr, VDPU_REG_RLC_VLC_BASE);
+
+       /* Destination frame buffer */
+       addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+       current_addr = addr;
+
+       if (picture->picture_structure == PICT_BOTTOM_FIELD)
+               addr += ALIGN(ctx->dst_fmt.width, 16);
+       vdpu_write_relaxed(vpu, addr, VDPU_REG_DEC_OUT_BASE);
+
+       if (!forward_addr)
+               forward_addr = current_addr;
+       if (!backward_addr)
+               backward_addr = current_addr;
+
+       /* Set forward ref frame (top/bottom field) */
+       if (picture->picture_structure == PICT_FRAME ||
+           picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B ||
+           (picture->picture_structure == PICT_TOP_FIELD &&
+            picture->top_field_first) ||
+           (picture->picture_structure == PICT_BOTTOM_FIELD &&
+            !picture->top_field_first)) {
+               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER0_BASE);
+               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER1_BASE);
+       } else if (picture->picture_structure == PICT_TOP_FIELD) {
+               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER0_BASE);
+               vdpu_write_relaxed(vpu, current_addr, VDPU_REG_REFER1_BASE);
+       } else if (picture->picture_structure == PICT_BOTTOM_FIELD) {
+               vdpu_write_relaxed(vpu, current_addr, VDPU_REG_REFER0_BASE);
+               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER1_BASE);
+       }
+
+       /* Set backward ref frame (top/bottom field) */
+       vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER2_BASE);
+       vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER3_BASE);
+}
+
+void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx)
+{
+       struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *src_buf, *dst_buf;
+       const struct v4l2_ctrl_mpeg2_slice_params *slice_params;
+       const struct v4l2_mpeg2_sequence *sequence;
+       const struct v4l2_mpeg2_picture *picture;
+       u32 reg;
+
+       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+
+       /* Apply request controls if any */
+       v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
+                               &ctx->ctrl_handler);
+
+       slice_params = hantro_get_ctrl(ctx,
+                                      V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS);
+       sequence = &slice_params->sequence;
+       picture = &slice_params->picture;
+
+       reg = VDPU_REG_DEC_ADV_PRE_DIS(0) |
+             VDPU_REG_DEC_SCMD_DIS(0) |
+             VDPU_REG_FILTERING_DIS(1) |
+             VDPU_REG_DEC_LATENCY(0);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(50));
+
+       reg = VDPU_REG_INIT_QP(1) |
+             VDPU_REG_STREAM_LEN(slice_params->bit_size >> 3);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(51));
+
+       reg = VDPU_REG_APF_THRESHOLD(8) |
+             VDPU_REG_STARTMB_X(0) |
+             VDPU_REG_STARTMB_Y(0);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(52));
+
+       reg = VDPU_REG_DEC_MODE(5);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(53));
+
+       reg = VDPU_REG_DEC_STRENDIAN_E(1) |
+             VDPU_REG_DEC_STRSWAP32_E(1) |
+             VDPU_REG_DEC_OUTSWAP32_E(1) |
+             VDPU_REG_DEC_INSWAP32_E(1) |
+             VDPU_REG_DEC_OUT_ENDIAN(1) |
+             VDPU_REG_DEC_IN_ENDIAN(1);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(54));
+
+       reg = VDPU_REG_DEC_DATA_DISC_E(0) |
+             VDPU_REG_DEC_MAX_BURST(16) |
+             VDPU_REG_DEC_AXI_WR_ID(0) |
+             VDPU_REG_DEC_AXI_RD_ID(0);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(56));
+
+       reg = VDPU_REG_RLC_MODE_E(0) |
+             VDPU_REG_PIC_INTERLACE_E(!sequence->progressive_sequence) |
+             VDPU_REG_PIC_FIELDMODE_E(picture->picture_structure != PICT_FRAME) |
+             VDPU_REG_PIC_B_E(picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B) |
+             VDPU_REG_PIC_INTER_E(picture->picture_coding_type != V4L2_MPEG2_PICTURE_CODING_TYPE_I) |
+             VDPU_REG_PIC_TOPFIELD_E(picture->picture_structure == PICT_TOP_FIELD) |
+             VDPU_REG_FWD_INTERLACE_E(0) |
+             VDPU_REG_WRITE_MVS_E(0) |
+             VDPU_REG_DEC_TIMEOUT_E(1) |
+             VDPU_REG_DEC_CLK_GATE_E(1);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(57));
+
+       reg = VDPU_REG_PIC_MB_WIDTH(MPEG2_MB_WIDTH(ctx->dst_fmt.width)) |
+             VDPU_REG_PIC_MB_HEIGHT_P(MPEG2_MB_HEIGHT(ctx->dst_fmt.height)) |
+             VDPU_REG_ALT_SCAN_E(picture->alternate_scan) |
+             VDPU_REG_TOPFIELDFIRST_E(picture->top_field_first);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(120));
+
+       reg = VDPU_REG_STRM_START_BIT(slice_params->data_bit_offset) |
+             VDPU_REG_QSCALE_TYPE(picture->q_scale_type) |
+             VDPU_REG_CON_MV_E(picture->concealment_motion_vectors) |
+             VDPU_REG_INTRA_DC_PREC(picture->intra_dc_precision) |
+             VDPU_REG_INTRA_VLC_TAB(picture->intra_vlc_format) |
+             VDPU_REG_FRAME_PRED_DCT(picture->frame_pred_frame_dct);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(122));
+
+       reg = VDPU_REG_ALT_SCAN_FLAG_E(picture->alternate_scan) |
+             VDPU_REG_FCODE_FWD_HOR(picture->f_code[0][0]) |
+             VDPU_REG_FCODE_FWD_VER(picture->f_code[0][1]) |
+             VDPU_REG_FCODE_BWD_HOR(picture->f_code[1][0]) |
+             VDPU_REG_FCODE_BWD_VER(picture->f_code[1][1]) |
+             VDPU_REG_MV_ACCURACY_FWD(1) |
+             VDPU_REG_MV_ACCURACY_BWD(1);
+       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(136));
+
+       rk3399_vpu_mpeg2_dec_set_quantization(vpu, ctx);
+
+       rk3399_vpu_mpeg2_dec_set_buffers(vpu, ctx, &src_buf->vb2_buf,
+                                        &dst_buf->vb2_buf,
+                                        sequence, picture, slice_params);
+
+       /* Controls no longer in-use, we can complete them */
+       v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req,
+                                  &ctx->ctrl_handler);
+
+       /* Kick the watchdog and start decoding */
+       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
+
+       reg = vdpu_read(vpu, VDPU_SWREG(57)) | VDPU_REG_DEC_E(1);
+       vdpu_write(vpu, reg, VDPU_SWREG(57));
+}
diff --git a/drivers/staging/media/hantro/rk3399_vpu_regs.h b/drivers/staging/media/hantro/rk3399_vpu_regs.h
new file mode 100644 (file)
index 0000000..88d0969
--- /dev/null
@@ -0,0 +1,600 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Hantro VPU codec driver
+ *
+ * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
+ *     Alpha Lin <alpha.lin@rock-chips.com>
+ */
+
+#ifndef RK3399_VPU_REGS_H_
+#define RK3399_VPU_REGS_H_
+
+/* Encoder registers. */
+#define VEPU_REG_VP8_QUT_1ST(i)                        (0x000 + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_DC_Y2(x)                  (((x) & 0x3fff) << 16)
+#define     VEPU_REG_VP8_QUT_DC_Y1(x)                  (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_QUT_2ND(i)                        (0x004 + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_AC_Y1(x)                  (((x) & 0x3fff) << 16)
+#define     VEPU_REG_VP8_QUT_DC_CHR(x)                 (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_QUT_3RD(i)                        (0x008 + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_AC_CHR(x)                 (((x) & 0x3fff) << 16)
+#define     VEPU_REG_VP8_QUT_AC_Y2(x)                  (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_QUT_4TH(i)                        (0x00c + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_ZB_DC_CHR(x)              (((x) & 0x1ff) << 18)
+#define     VEPU_REG_VP8_QUT_ZB_DC_Y2(x)               (((x) & 0x1ff) << 9)
+#define     VEPU_REG_VP8_QUT_ZB_DC_Y1(x)               (((x) & 0x1ff) << 0)
+#define VEPU_REG_VP8_QUT_5TH(i)                        (0x010 + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_ZB_AC_CHR(x)              (((x) & 0x1ff) << 18)
+#define     VEPU_REG_VP8_QUT_ZB_AC_Y2(x)               (((x) & 0x1ff) << 9)
+#define     VEPU_REG_VP8_QUT_ZB_AC_Y1(x)               (((x) & 0x1ff) << 0)
+#define VEPU_REG_VP8_QUT_6TH(i)                        (0x014 + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_RND_DC_CHR(x)             (((x) & 0xff) << 16)
+#define     VEPU_REG_VP8_QUT_RND_DC_Y2(x)              (((x) & 0xff) << 8)
+#define     VEPU_REG_VP8_QUT_RND_DC_Y1(x)              (((x) & 0xff) << 0)
+#define VEPU_REG_VP8_QUT_7TH(i)                        (0x018 + ((i) * 0x24))
+#define     VEPU_REG_VP8_QUT_RND_AC_CHR(x)             (((x) & 0xff) << 16)
+#define     VEPU_REG_VP8_QUT_RND_AC_Y2(x)              (((x) & 0xff) << 8)
+#define     VEPU_REG_VP8_QUT_RND_AC_Y1(x)              (((x) & 0xff) << 0)
+#define VEPU_REG_VP8_QUT_8TH(i)                        (0x01c + ((i) * 0x24))
+#define     VEPU_REG_VP8_SEG_FILTER_LEVEL(x)           (((x) & 0x3f) << 25)
+#define     VEPU_REG_VP8_DEQUT_DC_CHR(x)               (((x) & 0xff) << 17)
+#define     VEPU_REG_VP8_DEQUT_DC_Y2(x)                        (((x) & 0x1ff) << 8)
+#define     VEPU_REG_VP8_DEQUT_DC_Y1(x)                        (((x) & 0xff) << 0)
+#define VEPU_REG_VP8_QUT_9TH(i)                        (0x020 + ((i) * 0x24))
+#define     VEPU_REG_VP8_DEQUT_AC_CHR(x)               (((x) & 0x1ff) << 18)
+#define     VEPU_REG_VP8_DEQUT_AC_Y2(x)                        (((x) & 0x1ff) << 9)
+#define     VEPU_REG_VP8_DEQUT_AC_Y1(x)                        (((x) & 0x1ff) << 0)
+#define VEPU_REG_ADDR_VP8_SEG_MAP              0x06c
+#define VEPU_REG_VP8_INTRA_4X4_PENALTY(i)      (0x070 + ((i) * 0x4))
+#define     VEPU_REG_VP8_INTRA_4X4_PENALTY_0(x)                (((x) & 0xfff) << 0)
+#define     VEPU_REG_VP8_INTRA_4x4_PENALTY_1(x)                (((x) & 0xfff) << 16)
+#define VEPU_REG_VP8_INTRA_16X16_PENALTY(i)    (0x084 + ((i) * 0x4))
+#define     VEPU_REG_VP8_INTRA_16X16_PENALTY_0(x)      (((x) & 0xfff) << 0)
+#define     VEPU_REG_VP8_INTRA_16X16_PENALTY_1(x)      (((x) & 0xfff) << 16)
+#define VEPU_REG_VP8_CONTROL                   0x0a0
+#define     VEPU_REG_VP8_LF_MODE_DELTA_BPRED(x)                (((x) & 0x1f) << 24)
+#define     VEPU_REG_VP8_LF_REF_DELTA_INTRA_MB(x)      (((x) & 0x7f) << 16)
+#define     VEPU_REG_VP8_INTER_TYPE_BIT_COST(x)                (((x) & 0xfff) << 0)
+#define VEPU_REG_VP8_REF_FRAME_VAL             0x0a4
+#define     VEPU_REG_VP8_COEF_DMV_PENALTY(x)           (((x) & 0xfff) << 16)
+#define     VEPU_REG_VP8_REF_FRAME(x)                  (((x) & 0xfff) << 0)
+#define VEPU_REG_VP8_LOOP_FILTER_REF_DELTA     0x0a8
+#define     VEPU_REG_VP8_LF_REF_DELTA_ALT_REF(x)       (((x) & 0x7f) << 16)
+#define     VEPU_REG_VP8_LF_REF_DELTA_LAST_REF(x)      (((x) & 0x7f) << 8)
+#define     VEPU_REG_VP8_LF_REF_DELTA_GOLDEN(x)                (((x) & 0x7f) << 0)
+#define VEPU_REG_VP8_LOOP_FILTER_MODE_DELTA    0x0ac
+#define     VEPU_REG_VP8_LF_MODE_DELTA_SPLITMV(x)      (((x) & 0x7f) << 16)
+#define     VEPU_REG_VP8_LF_MODE_DELTA_ZEROMV(x)       (((x) & 0x7f) << 8)
+#define     VEPU_REG_VP8_LF_MODE_DELTA_NEWMV(x)                (((x) & 0x7f) << 0)
+#define        VEPU_REG_JPEG_LUMA_QUAT(i)              (0x000 + ((i) * 0x4))
+#define        VEPU_REG_JPEG_CHROMA_QUAT(i)            (0x040 + ((i) * 0x4))
+#define VEPU_REG_INTRA_SLICE_BITMAP(i)         (0x0b0 + ((i) * 0x4))
+#define VEPU_REG_ADDR_VP8_DCT_PART(i)          (0x0b0 + ((i) * 0x4))
+#define VEPU_REG_INTRA_AREA_CTRL               0x0b8
+#define     VEPU_REG_INTRA_AREA_TOP(x)                 (((x) & 0xff) << 24)
+#define     VEPU_REG_INTRA_AREA_BOTTOM(x)              (((x) & 0xff) << 16)
+#define     VEPU_REG_INTRA_AREA_LEFT(x)                        (((x) & 0xff) << 8)
+#define     VEPU_REG_INTRA_AREA_RIGHT(x)               (((x) & 0xff) << 0)
+#define VEPU_REG_CIR_INTRA_CTRL                        0x0bc
+#define     VEPU_REG_CIR_INTRA_FIRST_MB(x)             (((x) & 0xffff) << 16)
+#define     VEPU_REG_CIR_INTRA_INTERVAL(x)             (((x) & 0xffff) << 0)
+#define VEPU_REG_ADDR_IN_PLANE_0               0x0c0
+#define VEPU_REG_ADDR_IN_PLANE_1               0x0c4
+#define VEPU_REG_ADDR_IN_PLANE_2               0x0c8
+#define VEPU_REG_STR_HDR_REM_MSB               0x0cc
+#define VEPU_REG_STR_HDR_REM_LSB               0x0d0
+#define VEPU_REG_STR_BUF_LIMIT                 0x0d4
+#define VEPU_REG_AXI_CTRL                      0x0d8
+#define     VEPU_REG_AXI_CTRL_READ_ID(x)               (((x) & 0xff) << 24)
+#define     VEPU_REG_AXI_CTRL_WRITE_ID(x)              (((x) & 0xff) << 16)
+#define     VEPU_REG_AXI_CTRL_BURST_LEN(x)             (((x) & 0x3f) << 8)
+#define     VEPU_REG_AXI_CTRL_INCREMENT_MODE(x)                (((x) & 0x01) << 2)
+#define     VEPU_REG_AXI_CTRL_BIRST_DISCARD(x)         (((x) & 0x01) << 1)
+#define     VEPU_REG_AXI_CTRL_BIRST_DISABLE            BIT(0)
+#define VEPU_QP_ADJUST_MAD_DELTA_ROI           0x0dc
+#define     VEPU_REG_ROI_QP_DELTA_1                    (((x) & 0xf) << 12)
+#define     VEPU_REG_ROI_QP_DELTA_2                    (((x) & 0xf) << 8)
+#define     VEPU_REG_MAD_QP_ADJUSTMENT                 (((x) & 0xf) << 0)
+#define VEPU_REG_ADDR_REF_LUMA                 0x0e0
+#define VEPU_REG_ADDR_REF_CHROMA               0x0e4
+#define VEPU_REG_QP_SUM_DIV2                   0x0e8
+#define     VEPU_REG_QP_SUM(x)                         (((x) & 0x001fffff) * 2)
+#define VEPU_REG_ENC_CTRL0                     0x0ec
+#define     VEPU_REG_DISABLE_QUARTER_PIXEL_MV          BIT(28)
+#define     VEPU_REG_DEBLOCKING_FILTER_MODE(x)         (((x) & 0x3) << 24)
+#define     VEPU_REG_CABAC_INIT_IDC(x)                 (((x) & 0x3) << 21)
+#define     VEPU_REG_ENTROPY_CODING_MODE               BIT(20)
+#define     VEPU_REG_H264_TRANS8X8_MODE                        BIT(17)
+#define     VEPU_REG_H264_INTER4X4_MODE                        BIT(16)
+#define     VEPU_REG_H264_STREAM_MODE                  BIT(15)
+#define     VEPU_REG_H264_SLICE_SIZE(x)                        (((x) & 0x7f) << 8)
+#define VEPU_REG_ENC_OVER_FILL_STRM_OFFSET     0x0f0
+#define     VEPU_REG_STREAM_START_OFFSET(x)            (((x) & 0x3f) << 16)
+#define     VEPU_REG_SKIP_MACROBLOCK_PENALTY(x)                (((x) & 0xff) << 8)
+#define     VEPU_REG_IN_IMG_CTRL_OVRFLR_D4(x)          (((x) & 0x3) << 4)
+#define     VEPU_REG_IN_IMG_CTRL_OVRFLB(x)             (((x) & 0xf) << 0)
+#define VEPU_REG_INPUT_LUMA_INFO               0x0f4
+#define     VEPU_REG_IN_IMG_CHROMA_OFFSET(x)           (((x) & 0x7) << 20)
+#define     VEPU_REG_IN_IMG_LUMA_OFFSET(x)             (((x) & 0x7) << 16)
+#define     VEPU_REG_IN_IMG_CTRL_ROW_LEN(x)            (((x) & 0x3fff) << 0)
+#define VEPU_REG_RLC_SUM                       0x0f8
+#define     VEPU_REG_RLC_SUM_OUT(x)                    (((x) & 0x007fffff) * 4)
+#define VEPU_REG_SPLIT_PENALTY_4X4             0x0f8
+#define            VEPU_REG_VP8_SPLIT_PENALTY_4X4              (((x) & 0x1ff) << 19)
+#define VEPU_REG_ADDR_REC_LUMA                 0x0fc
+#define VEPU_REG_ADDR_REC_CHROMA               0x100
+#define VEPU_REG_CHECKPOINT(i)                 (0x104 + ((i) * 0x4))
+#define     VEPU_REG_CHECKPOINT_CHECK0(x)              (((x) & 0xffff))
+#define     VEPU_REG_CHECKPOINT_CHECK1(x)              (((x) & 0xffff) << 16)
+#define     VEPU_REG_CHECKPOINT_RESULT(x) \
+               ((((x) >> (16 - 16 * ((i) & 1))) & 0xffff) * 32)
+#define VEPU_REG_VP8_SEG0_QUANT_AC_Y1          0x104
+#define     VEPU_REG_VP8_SEG0_RND_AC_Y1(x)             (((x) & 0xff) << 23)
+#define     VEPU_REG_VP8_SEG0_ZBIN_AC_Y1(x)            (((x) & 0x1ff) << 14)
+#define     VEPU_REG_VP8_SEG0_QUT_AC_Y1(x)             (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_SEG0_QUANT_DC_Y2          0x108
+#define     VEPU_REG_VP8_SEG0_RND_DC_Y2(x)             (((x) & 0xff) << 23)
+#define     VEPU_REG_VP8_SEG0_ZBIN_DC_Y2(x)            (((x) & 0x1ff) << 14)
+#define     VEPU_REG_VP8_SEG0_QUT_DC_Y2(x)             (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_SEG0_QUANT_AC_Y2          0x10c
+#define     VEPU_REG_VP8_SEG0_RND_AC_Y2(x)             (((x) & 0xff) << 23)
+#define     VEPU_REG_VP8_SEG0_ZBIN_AC_Y2(x)            (((x) & 0x1ff) << 14)
+#define     VEPU_REG_VP8_SEG0_QUT_AC_Y2(x)             (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_SEG0_QUANT_DC_CHR         0x110
+#define     VEPU_REG_VP8_SEG0_RND_DC_CHR(x)            (((x) & 0xff) << 23)
+#define     VEPU_REG_VP8_SEG0_ZBIN_DC_CHR(x)           (((x) & 0x1ff) << 14)
+#define     VEPU_REG_VP8_SEG0_QUT_DC_CHR(x)            (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_SEG0_QUANT_AC_CHR         0x114
+#define     VEPU_REG_VP8_SEG0_RND_AC_CHR(x)            (((x) & 0xff) << 23)
+#define     VEPU_REG_VP8_SEG0_ZBIN_AC_CHR(x)           (((x) & 0x1ff) << 14)
+#define     VEPU_REG_VP8_SEG0_QUT_AC_CHR(x)            (((x) & 0x3fff) << 0)
+#define VEPU_REG_VP8_SEG0_QUANT_DQUT           0x118
+#define     VEPU_REG_VP8_MV_REF_IDX1(x)                        (((x) & 0x03) << 26)
+#define     VEPU_REG_VP8_SEG0_DQUT_DC_Y2(x)            (((x) & 0x1ff) << 17)
+#define     VEPU_REG_VP8_SEG0_DQUT_AC_Y1(x)            (((x) & 0x1ff) << 8)
+#define     VEPU_REG_VP8_SEG0_DQUT_DC_Y1(x)            (((x) & 0xff) << 0)
+#define VEPU_REG_CHKPT_WORD_ERR(i)             (0x118 + ((i) * 0x4))
+#define     VEPU_REG_CHKPT_WORD_ERR_CHK0(x)            (((x) & 0xffff))
+#define     VEPU_REG_CHKPT_WORD_ERR_CHK1(x)            (((x) & 0xffff) << 16)
+#define VEPU_REG_VP8_SEG0_QUANT_DQUT_1         0x11c
+#define     VEPU_REG_VP8_SEGMENT_MAP_UPDATE            BIT(30)
+#define     VEPU_REG_VP8_SEGMENT_EN                    BIT(29)
+#define     VEPU_REG_VP8_MV_REF_IDX2_EN                        BIT(28)
+#define     VEPU_REG_VP8_MV_REF_IDX2(x)                        (((x) & 0x03) << 26)
+#define     VEPU_REG_VP8_SEG0_DQUT_AC_CHR(x)           (((x) & 0x1ff) << 17)
+#define     VEPU_REG_VP8_SEG0_DQUT_DC_CHR(x)           (((x) & 0xff) << 9)
+#define     VEPU_REG_VP8_SEG0_DQUT_AC_Y2(x)            (((x) & 0x1ff) << 0)
+#define VEPU_REG_VP8_BOOL_ENC_VALUE            0x120
+#define VEPU_REG_CHKPT_DELTA_QP                        0x124
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK0(x)            (((x) & 0x0f) << 0)
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK1(x)            (((x) & 0x0f) << 4)
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK2(x)            (((x) & 0x0f) << 8)
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK3(x)            (((x) & 0x0f) << 12)
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK4(x)            (((x) & 0x0f) << 16)
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK5(x)            (((x) & 0x0f) << 20)
+#define     VEPU_REG_CHKPT_DELTA_QP_CHK6(x)            (((x) & 0x0f) << 24)
+#define VEPU_REG_VP8_ENC_CTRL2                 0x124
+#define     VEPU_REG_VP8_ZERO_MV_PENALTY_FOR_REF2(x)   (((x) & 0xff) << 24)
+#define     VEPU_REG_VP8_FILTER_SHARPNESS(x)           (((x) & 0x07) << 21)
+#define     VEPU_REG_VP8_FILTER_LEVEL(x)               (((x) & 0x3f) << 15)
+#define     VEPU_REG_VP8_DCT_PARTITION_CNT(x)          (((x) & 0x03) << 13)
+#define     VEPU_REG_VP8_BOOL_ENC_VALUE_BITS(x)                (((x) & 0x1f) << 8)
+#define     VEPU_REG_VP8_BOOL_ENC_RANGE(x)             (((x) & 0xff) << 0)
+#define VEPU_REG_ENC_CTRL1                     0x128
+#define     VEPU_REG_MAD_THRESHOLD(x)                  (((x) & 0x3f) << 24)
+#define     VEPU_REG_COMPLETED_SLICES(x)               (((x) & 0xff) << 16)
+#define     VEPU_REG_IN_IMG_CTRL_FMT(x)                        (((x) & 0xf) << 4)
+#define     VEPU_REG_IN_IMG_ROTATE_MODE(x)             (((x) & 0x3) << 2)
+#define     VEPU_REG_SIZE_TABLE_PRESENT                        BIT(0)
+#define VEPU_REG_INTRA_INTER_MODE              0x12c
+#define     VEPU_REG_INTRA16X16_MODE(x)                        (((x) & 0xffff) << 16)
+#define     VEPU_REG_INTER_MODE(x)                     (((x) & 0xffff) << 0)
+#define VEPU_REG_ENC_CTRL2                     0x130
+#define     VEPU_REG_PPS_INIT_QP(x)                    (((x) & 0x3f) << 26)
+#define     VEPU_REG_SLICE_FILTER_ALPHA(x)             (((x) & 0xf) << 22)
+#define     VEPU_REG_SLICE_FILTER_BETA(x)              (((x) & 0xf) << 18)
+#define     VEPU_REG_CHROMA_QP_OFFSET(x)               (((x) & 0x1f) << 13)
+#define     VEPU_REG_FILTER_DISABLE                    BIT(5)
+#define     VEPU_REG_IDR_PIC_ID(x)                     (((x) & 0xf) << 1)
+#define     VEPU_REG_CONSTRAINED_INTRA_PREDICTION      BIT(0)
+#define VEPU_REG_ADDR_OUTPUT_STREAM            0x134
+#define VEPU_REG_ADDR_OUTPUT_CTRL              0x138
+#define VEPU_REG_ADDR_NEXT_PIC                 0x13c
+#define VEPU_REG_ADDR_MV_OUT                   0x140
+#define VEPU_REG_ADDR_CABAC_TBL                        0x144
+#define VEPU_REG_ROI1                          0x148
+#define     VEPU_REG_ROI1_TOP_MB(x)                    (((x) & 0xff) << 24)
+#define     VEPU_REG_ROI1_BOTTOM_MB(x)                 (((x) & 0xff) << 16)
+#define     VEPU_REG_ROI1_LEFT_MB(x)                   (((x) & 0xff) << 8)
+#define     VEPU_REG_ROI1_RIGHT_MB(x)                  (((x) & 0xff) << 0)
+#define VEPU_REG_ROI2                          0x14c
+#define     VEPU_REG_ROI2_TOP_MB(x)                    (((x) & 0xff) << 24)
+#define     VEPU_REG_ROI2_BOTTOM_MB(x)                 (((x) & 0xff) << 16)
+#define     VEPU_REG_ROI2_LEFT_MB(x)                   (((x) & 0xff) << 8)
+#define     VEPU_REG_ROI2_RIGHT_MB(x)                  (((x) & 0xff) << 0)
+#define VEPU_REG_STABLE_MATRIX(i)              (0x150 + ((i) * 0x4))
+#define VEPU_REG_STABLE_MOTION_SUM             0x174
+#define VEPU_REG_STABILIZATION_OUTPUT          0x178
+#define     VEPU_REG_STABLE_MIN_VALUE(x)               (((x) & 0xffffff) << 8)
+#define     VEPU_REG_STABLE_MODE_SEL(x)                        (((x) & 0x3) << 6)
+#define     VEPU_REG_STABLE_HOR_GMV(x)                 (((x) & 0x3f) << 0)
+#define VEPU_REG_RGB2YUV_CONVERSION_COEF1      0x17c
+#define     VEPU_REG_RGB2YUV_CONVERSION_COEFB(x)       (((x) & 0xffff) << 16)
+#define     VEPU_REG_RGB2YUV_CONVERSION_COEFA(x)       (((x) & 0xffff) << 0)
+#define VEPU_REG_RGB2YUV_CONVERSION_COEF2      0x180
+#define     VEPU_REG_RGB2YUV_CONVERSION_COEFE(x)       (((x) & 0xffff) << 16)
+#define     VEPU_REG_RGB2YUV_CONVERSION_COEFC(x)       (((x) & 0xffff) << 0)
+#define VEPU_REG_RGB2YUV_CONVERSION_COEF3      0x184
+#define     VEPU_REG_RGB2YUV_CONVERSION_COEFF(x)       (((x) & 0xffff) << 0)
+#define VEPU_REG_RGB_MASK_MSB                  0x188
+#define     VEPU_REG_RGB_MASK_B_MSB(x)                 (((x) & 0x1f) << 16)
+#define     VEPU_REG_RGB_MASK_G_MSB(x)                 (((x) & 0x1f) << 8)
+#define     VEPU_REG_RGB_MASK_R_MSB(x)                 (((x) & 0x1f) << 0)
+#define VEPU_REG_MV_PENALTY                    0x18c
+#define     VEPU_REG_1MV_PENALTY(x)                    (((x) & 0x3ff) << 21)
+#define     VEPU_REG_QMV_PENALTY(x)                    (((x) & 0x3ff) << 11)
+#define     VEPU_REG_4MV_PENALTY(x)                    (((x) & 0x3ff) << 1)
+#define     VEPU_REG_SPLIT_MV_MODE_EN                  BIT(0)
+#define VEPU_REG_QP_VAL                                0x190
+#define     VEPU_REG_H264_LUMA_INIT_QP(x)              (((x) & 0x3f) << 26)
+#define     VEPU_REG_H264_QP_MAX(x)                    (((x) & 0x3f) << 20)
+#define     VEPU_REG_H264_QP_MIN(x)                    (((x) & 0x3f) << 14)
+#define     VEPU_REG_H264_CHKPT_DISTANCE(x)            (((x) & 0xfff) << 0)
+#define VEPU_REG_VP8_SEG0_QUANT_DC_Y1          0x190
+#define     VEPU_REG_VP8_SEG0_RND_DC_Y1(x)             (((x) & 0xff) << 23)
+#define     VEPU_REG_VP8_SEG0_ZBIN_DC_Y1(x)            (((x) & 0x1ff) << 14)
+#define     VEPU_REG_VP8_SEG0_QUT_DC_Y1(x)             (((x) & 0x3fff) << 0)
+#define VEPU_REG_MVC_RELATE                    0x198
+#define     VEPU_REG_ZERO_MV_FAVOR_D2(x)               (((x) & 0xf) << 20)
+#define     VEPU_REG_PENALTY_4X4MV(x)                  (((x) & 0x1ff) << 11)
+#define     VEPU_REG_MVC_VIEW_ID(x)                    (((x) & 0x7) << 8)
+#define     VEPU_REG_MVC_ANCHOR_PIC_FLAG               BIT(7)
+#define     VEPU_REG_MVC_PRIORITY_ID(x)                        (((x) & 0x7) << 4)
+#define     VEPU_REG_MVC_TEMPORAL_ID(x)                        (((x) & 0x7) << 1)
+#define     VEPU_REG_MVC_INTER_VIEW_FLAG               BIT(0)
+#define VEPU_REG_ENCODE_START                  0x19c
+#define     VEPU_REG_MB_HEIGHT(x)                      (((x) & 0x1ff) << 20)
+#define     VEPU_REG_MB_WIDTH(x)                       (((x) & 0x1ff) << 8)
+#define     VEPU_REG_FRAME_TYPE_INTER                  (0x0 << 6)
+#define     VEPU_REG_FRAME_TYPE_INTRA                  (0x1 << 6)
+#define     VEPU_REG_FRAME_TYPE_MVCINTER               (0x2 << 6)
+#define     VEPU_REG_ENCODE_FORMAT_JPEG                        (0x2 << 4)
+#define     VEPU_REG_ENCODE_FORMAT_H264                        (0x3 << 4)
+#define     VEPU_REG_ENCODE_ENABLE                     BIT(0)
+#define VEPU_REG_MB_CTRL                       0x1a0
+#define     VEPU_REG_MB_CNT_OUT(x)                     (((x) & 0xffff) << 16)
+#define     VEPU_REG_MB_CNT_SET(x)                     (((x) & 0xffff) << 0)
+#define VEPU_REG_DATA_ENDIAN                   0x1a4
+#define     VEPU_REG_INPUT_SWAP8                       BIT(31)
+#define     VEPU_REG_INPUT_SWAP16                      BIT(30)
+#define     VEPU_REG_INPUT_SWAP32                      BIT(29)
+#define     VEPU_REG_OUTPUT_SWAP8                      BIT(28)
+#define     VEPU_REG_OUTPUT_SWAP16                     BIT(27)
+#define     VEPU_REG_OUTPUT_SWAP32                     BIT(26)
+#define     VEPU_REG_TEST_IRQ                          BIT(24)
+#define     VEPU_REG_TEST_COUNTER(x)                   (((x) & 0xf) << 20)
+#define     VEPU_REG_TEST_REG                          BIT(19)
+#define     VEPU_REG_TEST_MEMORY                       BIT(18)
+#define     VEPU_REG_TEST_LEN(x)                       (((x) & 0x3ffff) << 0)
+#define VEPU_REG_ENC_CTRL3                     0x1a8
+#define     VEPU_REG_PPS_ID(x)                         (((x) & 0xff) << 24)
+#define     VEPU_REG_INTRA_PRED_MODE(x)                        (((x) & 0xff) << 16)
+#define     VEPU_REG_FRAME_NUM(x)                      (((x) & 0xffff) << 0)
+#define VEPU_REG_ENC_CTRL4                     0x1ac
+#define     VEPU_REG_MV_PENALTY_16X8_8X16(x)           (((x) & 0x3ff) << 20)
+#define     VEPU_REG_MV_PENALTY_8X8(x)                 (((x) & 0x3ff) << 10)
+#define     VEPU_REG_MV_PENALTY_8X4_4X8(x)             (((x) & 0x3ff) << 0)
+#define VEPU_REG_ADDR_VP8_PROB_CNT             0x1b0
+#define VEPU_REG_INTERRUPT                     0x1b4
+#define     VEPU_REG_INTERRUPT_NON                     BIT(28)
+#define     VEPU_REG_MV_WRITE_EN                       BIT(24)
+#define     VEPU_REG_RECON_WRITE_DIS                   BIT(20)
+#define     VEPU_REG_INTERRUPT_SLICE_READY_EN          BIT(16)
+#define     VEPU_REG_CLK_GATING_EN                     BIT(12)
+#define     VEPU_REG_INTERRUPT_TIMEOUT_EN              BIT(10)
+#define     VEPU_REG_INTERRUPT_RESET                   BIT(9)
+#define     VEPU_REG_INTERRUPT_DIS_BIT                 BIT(8)
+#define     VEPU_REG_INTERRUPT_TIMEOUT                 BIT(6)
+#define     VEPU_REG_INTERRUPT_BUFFER_FULL             BIT(5)
+#define     VEPU_REG_INTERRUPT_BUS_ERROR               BIT(4)
+#define     VEPU_REG_INTERRUPT_FUSE                    BIT(3)
+#define     VEPU_REG_INTERRUPT_SLICE_READY             BIT(2)
+#define     VEPU_REG_INTERRUPT_FRAME_READY             BIT(1)
+#define     VEPU_REG_INTERRUPT_BIT                     BIT(0)
+#define VEPU_REG_DMV_PENALTY_TBL(i)            (0x1E0 + ((i) * 0x4))
+#define     VEPU_REG_DMV_PENALTY_TABLE_BIT(x, i)        ((x) << (i) * 8)
+#define VEPU_REG_DMV_Q_PIXEL_PENALTY_TBL(i)    (0x260 + ((i) * 0x4))
+#define     VEPU_REG_DMV_Q_PIXEL_PENALTY_TABLE_BIT(x, i)       ((x) << (i) * 8)
+
+/* vpu decoder register */
+#define VDPU_REG_DEC_CTRL0                     0x0c8 // 50
+#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_PICID(x)     (((x) & 0x1f) << 25)
+#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_THR(x)       (((x) & 0xfff) << 13)
+#define     VDPU_REG_CONFIG_TILED_MODE_LSB             BIT(12)
+#define     VDPU_REG_CONFIG_DEC_ADV_PRE_DIS            BIT(11)
+#define     VDPU_REG_CONFIG_DEC_SCMD_DIS               BIT(10)
+#define     VDPU_REG_DEC_CTRL0_SKIP_MODE               BIT(9)
+#define     VDPU_REG_DEC_CTRL0_FILTERING_DIS           BIT(8)
+#define     VDPU_REG_DEC_CTRL0_PIC_FIXED_QUANT         BIT(7)
+#define     VDPU_REG_CONFIG_DEC_LATENCY(x)             (((x) & 0x3f) << 1)
+#define     VDPU_REG_CONFIG_TILED_MODE_MSB(x)          BIT(0)
+#define     VDPU_REG_CONFIG_DEC_OUT_TILED_E            BIT(0)
+#define VDPU_REG_STREAM_LEN                    0x0cc
+#define     VDPU_REG_DEC_CTRL3_INIT_QP(x)              (((x) & 0x3f) << 25)
+#define     VDPU_REG_DEC_STREAM_LEN_HI                 BIT(24)
+#define     VDPU_REG_DEC_CTRL3_STREAM_LEN(x)           (((x) & 0xffffff) << 0)
+#define VDPU_REG_ERROR_CONCEALMENT             0x0d0
+#define     VDPU_REG_REF_BUF_CTRL2_APF_THRESHOLD(x)    (((x) & 0x3fff) << 17)
+#define     VDPU_REG_ERR_CONC_STARTMB_X(x)             (((x) & 0x1ff) << 8)
+#define     VDPU_REG_ERR_CONC_STARTMB_Y(x)             (((x) & 0xff) << 0)
+#define VDPU_REG_DEC_FORMAT                    0x0d4
+#define     VDPU_REG_DEC_CTRL0_DEC_MODE(x)             (((x) & 0xf) << 0)
+#define VDPU_REG_DATA_ENDIAN                   0x0d8
+#define     VDPU_REG_CONFIG_DEC_STRENDIAN_E            BIT(5)
+#define     VDPU_REG_CONFIG_DEC_STRSWAP32_E            BIT(4)
+#define     VDPU_REG_CONFIG_DEC_OUTSWAP32_E            BIT(3)
+#define     VDPU_REG_CONFIG_DEC_INSWAP32_E             BIT(2)
+#define     VDPU_REG_CONFIG_DEC_OUT_ENDIAN             BIT(1)
+#define     VDPU_REG_CONFIG_DEC_IN_ENDIAN              BIT(0)
+#define VDPU_REG_INTERRUPT                     0x0dc
+#define     VDPU_REG_INTERRUPT_DEC_TIMEOUT             BIT(13)
+#define     VDPU_REG_INTERRUPT_DEC_ERROR_INT           BIT(12)
+#define     VDPU_REG_INTERRUPT_DEC_PIC_INF             BIT(10)
+#define     VDPU_REG_INTERRUPT_DEC_SLICE_INT           BIT(9)
+#define     VDPU_REG_INTERRUPT_DEC_ASO_INT             BIT(8)
+#define     VDPU_REG_INTERRUPT_DEC_BUFFER_INT          BIT(6)
+#define     VDPU_REG_INTERRUPT_DEC_BUS_INT             BIT(5)
+#define     VDPU_REG_INTERRUPT_DEC_RDY_INT             BIT(4)
+#define     VDPU_REG_INTERRUPT_DEC_IRQ_DIS             BIT(1)
+#define     VDPU_REG_INTERRUPT_DEC_IRQ                 BIT(0)
+#define VDPU_REG_AXI_CTRL                      0x0e0
+#define     VDPU_REG_AXI_DEC_SEL                       BIT(23)
+#define     VDPU_REG_CONFIG_DEC_DATA_DISC_E            BIT(22)
+#define     VDPU_REG_PARAL_BUS_E(x)                    BIT(21)
+#define     VDPU_REG_CONFIG_DEC_MAX_BURST(x)           (((x) & 0x1f) << 16)
+#define     VDPU_REG_DEC_CTRL0_DEC_AXI_WR_ID(x)                (((x) & 0xff) << 8)
+#define     VDPU_REG_CONFIG_DEC_AXI_RD_ID(x)           (((x) & 0xff) << 0)
+#define VDPU_REG_EN_FLAGS                      0x0e4
+#define     VDPU_REG_AHB_HLOCK_E                       BIT(31)
+#define     VDPU_REG_CACHE_E                           BIT(29)
+#define     VDPU_REG_PREFETCH_SINGLE_CHANNEL_E         BIT(28)
+#define     VDPU_REG_INTRA_3_CYCLE_ENHANCE             BIT(27)
+#define     VDPU_REG_INTRA_DOUBLE_SPEED                        BIT(26)
+#define     VDPU_REG_INTER_DOUBLE_SPEED                        BIT(25)
+#define     VDPU_REG_DEC_CTRL3_START_CODE_E            BIT(22)
+#define     VDPU_REG_DEC_CTRL3_CH_8PIX_ILEAV_E         BIT(21)
+#define     VDPU_REG_DEC_CTRL0_RLC_MODE_E              BIT(20)
+#define     VDPU_REG_DEC_CTRL0_DIVX3_E                 BIT(19)
+#define     VDPU_REG_DEC_CTRL0_PJPEG_E                 BIT(18)
+#define     VDPU_REG_DEC_CTRL0_PIC_INTERLACE_E         BIT(17)
+#define     VDPU_REG_DEC_CTRL0_PIC_FIELDMODE_E         BIT(16)
+#define     VDPU_REG_DEC_CTRL0_PIC_B_E                 BIT(15)
+#define     VDPU_REG_DEC_CTRL0_PIC_INTER_E             BIT(14)
+#define     VDPU_REG_DEC_CTRL0_PIC_TOPFIELD_E          BIT(13)
+#define     VDPU_REG_DEC_CTRL0_FWD_INTERLACE_E         BIT(12)
+#define     VDPU_REG_DEC_CTRL0_SORENSON_E              BIT(11)
+#define     VDPU_REG_DEC_CTRL0_WRITE_MVS_E             BIT(10)
+#define     VDPU_REG_DEC_CTRL0_REF_TOPFIELD_E          BIT(9)
+#define     VDPU_REG_DEC_CTRL0_REFTOPFIRST_E           BIT(8)
+#define     VDPU_REG_DEC_CTRL0_SEQ_MBAFF_E             BIT(7)
+#define     VDPU_REG_DEC_CTRL0_PICORD_COUNT_E          BIT(6)
+#define     VDPU_REG_CONFIG_DEC_TIMEOUT_E              BIT(5)
+#define     VDPU_REG_CONFIG_DEC_CLK_GATE_E             BIT(4)
+#define     VDPU_REG_DEC_CTRL0_DEC_OUT_DIS             BIT(2)
+#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_BUF_E                BIT(1)
+#define     VDPU_REG_INTERRUPT_DEC_E                   BIT(0)
+#define VDPU_REG_SOFT_RESET                    0x0e8
+#define VDPU_REG_PRED_FLT                      0x0ec
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_0(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_1(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_2(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_ADDITIONAL_CHROMA_ADDRESS     0x0f0
+#define VDPU_REG_ADDR_QTABLE                   0x0f4
+#define VDPU_REG_DIRECT_MV_ADDR                        0x0f8
+#define VDPU_REG_ADDR_DST                      0x0fc
+#define VDPU_REG_ADDR_STR                      0x100
+#define VDPU_REG_REFBUF_RELATED                        0x104
+#define VDPU_REG_FWD_PIC(i)                    (0x128 + ((i) * 0x4))
+#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F5(x)         (((x) & 0x1f) << 25)
+#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F4(x)         (((x) & 0x1f) << 20)
+#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F3(x)         (((x) & 0x1f) << 15)
+#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F2(x)         (((x) & 0x1f) << 10)
+#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F1(x)         (((x) & 0x1f) << 5)
+#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F0(x)         (((x) & 0x1f) << 0)
+#define VDPU_REG_REF_PIC(i)                    (0x130 + ((i) * 0x4))
+#define     VDPU_REG_REF_PIC_REFER1_NBR(x)             (((x) & 0xffff) << 16)
+#define     VDPU_REG_REF_PIC_REFER0_NBR(x)             (((x) & 0xffff) << 0)
+#define VDPU_REG_H264_ADDR_REF(i)                      (0x150 + ((i) * 0x4))
+#define     VDPU_REG_ADDR_REF_FIELD_E                  BIT(1)
+#define     VDPU_REG_ADDR_REF_TOPC_E                   BIT(0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST0         0x190
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F5(x)      (((x) & 0x1f) << 25)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F4(x)      (((x) & 0x1f) << 20)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F3(x)      (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F2(x)      (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F1(x)      (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F0(x)      (((x) & 0x1f) << 0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST1         0x194
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F11(x)     (((x) & 0x1f) << 25)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F10(x)     (((x) & 0x1f) << 20)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F9(x)      (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F8(x)      (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F7(x)      (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F6(x)      (((x) & 0x1f) << 0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST2         0x198
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F15(x)     (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F14(x)     (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F13(x)     (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F12(x)     (((x) & 0x1f) << 0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST3         0x19c
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B5(x)      (((x) & 0x1f) << 25)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B4(x)      (((x) & 0x1f) << 20)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B3(x)      (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B2(x)      (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B1(x)      (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B0(x)      (((x) & 0x1f) << 0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST4         0x1a0
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B11(x)     (((x) & 0x1f) << 25)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B10(x)     (((x) & 0x1f) << 20)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B9(x)      (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B8(x)      (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B7(x)      (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B6(x)      (((x) & 0x1f) << 0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST5         0x1a4
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B15(x)     (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B14(x)     (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B13(x)     (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B12(x)     (((x) & 0x1f) << 0)
+#define VDPU_REG_INITIAL_REF_PIC_LIST6         0x1a8
+#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F3(x)    (((x) & 0x1f) << 15)
+#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F2(x)    (((x) & 0x1f) << 10)
+#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F1(x)    (((x) & 0x1f) << 5)
+#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F0(x)    (((x) & 0x1f) << 0)
+#define VDPU_REG_LT_REF                                0x1ac
+#define VDPU_REG_VALID_REF                     0x1b0
+#define VDPU_REG_H264_PIC_MB_SIZE              0x1b8
+#define     VDPU_REG_DEC_CTRL2_CH_QP_OFFSET2(x)                (((x) & 0x1f) << 22)
+#define     VDPU_REG_DEC_CTRL2_CH_QP_OFFSET(x)         (((x) & 0x1f) << 17)
+#define     VDPU_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(x)      (((x) & 0xff) << 9)
+#define     VDPU_REG_DEC_CTRL1_PIC_MB_WIDTH(x)         (((x) & 0x1ff) << 0)
+#define VDPU_REG_H264_CTRL                     0x1bc
+#define     VDPU_REG_DEC_CTRL4_WEIGHT_BIPR_IDC(x)      (((x) & 0x3) << 16)
+#define     VDPU_REG_DEC_CTRL1_REF_FRAMES(x)           (((x) & 0x1f) << 0)
+#define VDPU_REG_CURRENT_FRAME                 0x1c0
+#define     VDPU_REG_DEC_CTRL5_FILT_CTRL_PRES          BIT(31)
+#define     VDPU_REG_DEC_CTRL5_RDPIC_CNT_PRES          BIT(30)
+#define     VDPU_REG_DEC_CTRL4_FRAMENUM_LEN(x)         (((x) & 0x1f) << 16)
+#define     VDPU_REG_DEC_CTRL4_FRAMENUM(x)             (((x) & 0xffff) << 0)
+#define VDPU_REG_REF_FRAME                     0x1c4
+#define     VDPU_REG_DEC_CTRL5_REFPIC_MK_LEN(x)                (((x) & 0x7ff) << 16)
+#define     VDPU_REG_DEC_CTRL5_IDR_PIC_ID(x)           (((x) & 0xffff) << 0)
+#define VDPU_REG_DEC_CTRL6                     0x1c8
+#define     VDPU_REG_DEC_CTRL6_PPS_ID(x)               (((x) & 0xff) << 24)
+#define     VDPU_REG_DEC_CTRL6_REFIDX1_ACTIVE(x)       (((x) & 0x1f) << 19)
+#define     VDPU_REG_DEC_CTRL6_REFIDX0_ACTIVE(x)       (((x) & 0x1f) << 14)
+#define     VDPU_REG_DEC_CTRL6_POC_LENGTH(x)           (((x) & 0xff) << 0)
+#define VDPU_REG_ENABLE_FLAG                   0x1cc
+#define     VDPU_REG_DEC_CTRL5_IDR_PIC_E               BIT(8)
+#define     VDPU_REG_DEC_CTRL4_DIR_8X8_INFER_E         BIT(7)
+#define     VDPU_REG_DEC_CTRL4_BLACKWHITE_E            BIT(6)
+#define     VDPU_REG_DEC_CTRL4_CABAC_E                 BIT(5)
+#define     VDPU_REG_DEC_CTRL4_WEIGHT_PRED_E           BIT(4)
+#define     VDPU_REG_DEC_CTRL5_CONST_INTRA_E           BIT(3)
+#define     VDPU_REG_DEC_CTRL5_8X8TRANS_FLAG_E         BIT(2)
+#define     VDPU_REG_DEC_CTRL2_TYPE1_QUANT_E           BIT(1)
+#define     VDPU_REG_DEC_CTRL2_FIELDPIC_FLAG_E         BIT(0)
+#define VDPU_REG_VP8_PIC_MB_SIZE               0x1e0
+#define     VDPU_REG_DEC_PIC_MB_WIDTH(x)               (((x) & 0x1ff) << 23)
+#define            VDPU_REG_DEC_MB_WIDTH_OFF(x)                (((x) & 0xf) << 19)
+#define            VDPU_REG_DEC_PIC_MB_HEIGHT_P(x)             (((x) & 0xff) << 11)
+#define     VDPU_REG_DEC_MB_HEIGHT_OFF(x)              (((x) & 0xf) << 7)
+#define     VDPU_REG_DEC_CTRL1_PIC_MB_W_EXT(x)         (((x) & 0x7) << 3)
+#define     VDPU_REG_DEC_CTRL1_PIC_MB_H_EXT(x)         (((x) & 0x7) << 0)
+#define VDPU_REG_VP8_DCT_START_BIT             0x1e4
+#define     VDPU_REG_DEC_CTRL4_DCT1_START_BIT(x)       (((x) & 0x3f) << 26)
+#define     VDPU_REG_DEC_CTRL4_DCT2_START_BIT(x)       (((x) & 0x3f) << 20)
+#define     VDPU_REG_DEC_CTRL4_VC1_HEIGHT_EXT          BIT(13)
+#define     VDPU_REG_DEC_CTRL4_BILIN_MC_E              BIT(12)
+#define VDPU_REG_VP8_CTRL0                     0x1e8
+#define     VDPU_REG_DEC_CTRL2_STRM_START_BIT(x)       (((x) & 0x3f) << 26)
+#define     VDPU_REG_DEC_CTRL2_STRM1_START_BIT(x)      (((x) & 0x3f) << 18)
+#define     VDPU_REG_DEC_CTRL2_BOOLEAN_VALUE(x)                (((x) & 0xff) << 8)
+#define     VDPU_REG_DEC_CTRL2_BOOLEAN_RANGE(x)                (((x) & 0xff) << 0)
+#define VDPU_REG_VP8_DATA_VAL                  0x1f0
+#define     VDPU_REG_DEC_CTRL6_COEFFS_PART_AM(x)       (((x) & 0xf) << 24)
+#define     VDPU_REG_DEC_CTRL6_STREAM1_LEN(x)          (((x) & 0xffffff) << 0)
+#define VDPU_REG_PRED_FLT7                     0x1f4
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_1(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_2(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_3(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT8                     0x1f8
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_0(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_1(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_2(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT9                     0x1fc
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_3(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_0(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_1(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT10                    0x200
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_2(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_3(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_BD_REF_PIC_PRED_TAP_2_M1(x)       (((x) & 0x3) << 10)
+#define     VDPU_REG_BD_REF_PIC_PRED_TAP_2_4(x)                (((x) & 0x3) << 8)
+#define     VDPU_REG_BD_REF_PIC_PRED_TAP_4_M1(x)       (((x) & 0x3) << 6)
+#define     VDPU_REG_BD_REF_PIC_PRED_TAP_4_4(x)                (((x) & 0x3) << 4)
+#define     VDPU_REG_BD_REF_PIC_PRED_TAP_6_M1(x)       (((x) & 0x3) << 2)
+#define     VDPU_REG_BD_REF_PIC_PRED_TAP_6_4(x)                (((x) & 0x3) << 0)
+#define VDPU_REG_FILTER_LEVEL                  0x204
+#define     VDPU_REG_REF_PIC_LF_LEVEL_0(x)             (((x) & 0x3f) << 18)
+#define     VDPU_REG_REF_PIC_LF_LEVEL_1(x)             (((x) & 0x3f) << 12)
+#define     VDPU_REG_REF_PIC_LF_LEVEL_2(x)             (((x) & 0x3f) << 6)
+#define     VDPU_REG_REF_PIC_LF_LEVEL_3(x)             (((x) & 0x3f) << 0)
+#define VDPU_REG_VP8_QUANTER0                  0x208
+#define     VDPU_REG_REF_PIC_QUANT_DELTA_0(x)          (((x) & 0x1f) << 27)
+#define     VDPU_REG_REF_PIC_QUANT_DELTA_1(x)          (((x) & 0x1f) << 22)
+#define     VDPU_REG_REF_PIC_QUANT_0(x)                        (((x) & 0x7ff) << 11)
+#define     VDPU_REG_REF_PIC_QUANT_1(x)                        (((x) & 0x7ff) << 0)
+#define VDPU_REG_VP8_ADDR_REF0                 0x20c
+#define VDPU_REG_FILTER_MB_ADJ                 0x210
+#define     VDPU_REG_REF_PIC_FILT_TYPE_E               BIT(31)
+#define     VDPU_REG_REF_PIC_FILT_SHARPNESS(x)         (((x) & 0x7) << 28)
+#define     VDPU_REG_FILT_MB_ADJ_0(x)                  (((x) & 0x7f) << 21)
+#define     VDPU_REG_FILT_MB_ADJ_1(x)                  (((x) & 0x7f) << 14)
+#define     VDPU_REG_FILT_MB_ADJ_2(x)                  (((x) & 0x7f) << 7)
+#define     VDPU_REG_FILT_MB_ADJ_3(x)                  (((x) & 0x7f) << 0)
+#define VDPU_REG_FILTER_REF_ADJ                        0x214
+#define     VDPU_REG_REF_PIC_ADJ_0(x)                  (((x) & 0x7f) << 21)
+#define     VDPU_REG_REF_PIC_ADJ_1(x)                  (((x) & 0x7f) << 14)
+#define     VDPU_REG_REF_PIC_ADJ_2(x)                  (((x) & 0x7f) << 7)
+#define     VDPU_REG_REF_PIC_ADJ_3(x)                  (((x) & 0x7f) << 0)
+#define VDPU_REG_VP8_ADDR_REF2_5(i)            (0x218 + ((i) * 0x4))
+#define     VDPU_REG_VP8_GREF_SIGN_BIAS                        BIT(0)
+#define     VDPU_REG_VP8_AREF_SIGN_BIAS                        BIT(0)
+#define VDPU_REG_VP8_DCT_BASE(i)               (0x230 + ((i) * 0x4))
+#define VDPU_REG_VP8_ADDR_CTRL_PART            0x244
+#define VDPU_REG_VP8_ADDR_REF1                 0x250
+#define VDPU_REG_VP8_SEGMENT_VAL               0x254
+#define     VDPU_REG_FWD_PIC1_SEGMENT_BASE(x)          ((x) << 0)
+#define     VDPU_REG_FWD_PIC1_SEGMENT_UPD_E            BIT(1)
+#define     VDPU_REG_FWD_PIC1_SEGMENT_E                        BIT(0)
+#define VDPU_REG_VP8_DCT_START_BIT2            0x258
+#define     VDPU_REG_DEC_CTRL7_DCT3_START_BIT(x)       (((x) & 0x3f) << 24)
+#define     VDPU_REG_DEC_CTRL7_DCT4_START_BIT(x)       (((x) & 0x3f) << 18)
+#define     VDPU_REG_DEC_CTRL7_DCT5_START_BIT(x)       (((x) & 0x3f) << 12)
+#define     VDPU_REG_DEC_CTRL7_DCT6_START_BIT(x)       (((x) & 0x3f) << 6)
+#define     VDPU_REG_DEC_CTRL7_DCT7_START_BIT(x)       (((x) & 0x3f) << 0)
+#define VDPU_REG_VP8_QUANTER1                  0x25c
+#define     VDPU_REG_REF_PIC_QUANT_DELTA_2(x)          (((x) & 0x1f) << 27)
+#define     VDPU_REG_REF_PIC_QUANT_DELTA_3(x)          (((x) & 0x1f) << 22)
+#define     VDPU_REG_REF_PIC_QUANT_2(x)                        (((x) & 0x7ff) << 11)
+#define     VDPU_REG_REF_PIC_QUANT_3(x)                        (((x) & 0x7ff) << 0)
+#define VDPU_REG_VP8_QUANTER2                  0x260
+#define     VDPU_REG_REF_PIC_QUANT_DELTA_4(x)          (((x) & 0x1f) << 27)
+#define     VDPU_REG_REF_PIC_QUANT_4(x)                        (((x) & 0x7ff) << 11)
+#define     VDPU_REG_REF_PIC_QUANT_5(x)                        (((x) & 0x7ff) << 0)
+#define VDPU_REG_PRED_FLT1                     0x264
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_3(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_0(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_1(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT2                     0x268
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_2(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_3(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_0(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT3                     0x26c
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_1(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_2(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_3(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT4                     0x270
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_0(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_1(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_2(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT5                     0x274
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_3(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_0(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_1(x)       (((x) & 0x3ff) << 2)
+#define VDPU_REG_PRED_FLT6                     0x278
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_2(x)       (((x) & 0x3ff) << 22)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_3(x)       (((x) & 0x3ff) << 12)
+#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_0(x)       (((x) & 0x3ff) << 2)
+
+#endif /* RK3399_VPU_REGS_H_ */
diff --git a/drivers/staging/media/rockchip/vpu/Kconfig b/drivers/staging/media/rockchip/vpu/Kconfig
deleted file mode 100644 (file)
index 842b003..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config VIDEO_ROCKCHIP_VPU
-       tristate "Rockchip VPU driver"
-       depends on ARCH_ROCKCHIP || COMPILE_TEST
-       depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER
-       depends on MEDIA_CONTROLLER_REQUEST_API
-       select VIDEOBUF2_DMA_CONTIG
-       select VIDEOBUF2_VMALLOC
-       select V4L2_MEM2MEM_DEV
-       help
-         Support for the Video Processing Unit present on Rockchip SoC,
-         which accelerates video and image encoding and decoding.
-         To compile this driver as a module, choose M here: the module
-         will be called rockchip-vpu.
diff --git a/drivers/staging/media/rockchip/vpu/Makefile b/drivers/staging/media/rockchip/vpu/Makefile
deleted file mode 100644 (file)
index be27815..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu.o
-
-rockchip-vpu-y += \
-               rockchip_vpu_drv.o \
-               rockchip_vpu_v4l2.o \
-               rk3288_vpu_hw.o \
-               rk3288_vpu_hw_jpeg_enc.o \
-               rk3288_vpu_hw_mpeg2_dec.o \
-               rk3399_vpu_hw.o \
-               rk3399_vpu_hw_jpeg_enc.o \
-               rk3399_vpu_hw_mpeg2_dec.o \
-               rockchip_vpu_jpeg.o \
-               rockchip_vpu_mpeg2.o
diff --git a/drivers/staging/media/rockchip/vpu/TODO b/drivers/staging/media/rockchip/vpu/TODO
deleted file mode 100644 (file)
index fa0c940..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-* Support for VP8, VP9 and H264 is planned for this driver.
-
-  Given the V4L controls for those CODECs will be part of
-  the uABI, it will be required to have the driver in staging.
-
-  For this reason, we are keeping this driver in staging for now.
-
-* Add support for the S_SELECTION API.
-  See the comment for VEPU_REG_ENC_OVER_FILL_STRM_OFFSET.
-
-* Instead of having a DMA bounce buffer, it could be possible to use a
-  normal buffer and memmove() the payload to make space for the header.
-  This might need to use extra JPEG markers for padding reasons.
diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c
deleted file mode 100644 (file)
index 003143c..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- *     Jeffy Chen <jeffy.chen@rock-chips.com>
- */
-
-#include <linux/clk.h>
-
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_jpeg.h"
-#include "rk3288_vpu_regs.h"
-
-#define RK3288_ACLK_MAX_FREQ (400 * 1000 * 1000)
-
-/*
- * Supported formats.
- */
-
-static const struct rockchip_vpu_fmt rk3288_vpu_enc_fmts[] = {
-       {
-               .fourcc = V4L2_PIX_FMT_YUV420M,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420P,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV12M,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420SP,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_YUYV,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_YUYV422,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_UYVY,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_UYVY422,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_JPEG,
-               .codec_mode = RK_VPU_MODE_JPEG_ENC,
-               .max_depth = 2,
-               .header_size = JPEG_HEADER_SIZE,
-               .frmsize = {
-                       .min_width = 96,
-                       .max_width = 8192,
-                       .step_width = JPEG_MB_DIM,
-                       .min_height = 32,
-                       .max_height = 8192,
-                       .step_height = JPEG_MB_DIM,
-               },
-       },
-};
-
-static const struct rockchip_vpu_fmt rk3288_vpu_dec_fmts[] = {
-       {
-               .fourcc = V4L2_PIX_FMT_NV12,
-               .codec_mode = RK_VPU_MODE_NONE,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
-               .codec_mode = RK_VPU_MODE_MPEG2_DEC,
-               .max_depth = 2,
-               .frmsize = {
-                       .min_width = 48,
-                       .max_width = 1920,
-                       .step_width = MPEG2_MB_DIM,
-                       .min_height = 48,
-                       .max_height = 1088,
-                       .step_height = MPEG2_MB_DIM,
-               },
-       },
-};
-
-static irqreturn_t rk3288_vepu_irq(int irq, void *dev_id)
-{
-       struct rockchip_vpu_dev *vpu = dev_id;
-       enum vb2_buffer_state state;
-       u32 status, bytesused;
-
-       status = vepu_read(vpu, VEPU_REG_INTERRUPT);
-       bytesused = vepu_read(vpu, VEPU_REG_STR_BUF_LIMIT) / 8;
-       state = (status & VEPU_REG_INTERRUPT_FRAME_RDY) ?
-               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
-
-       vepu_write(vpu, 0, VEPU_REG_INTERRUPT);
-       vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);
-
-       rockchip_vpu_irq_done(vpu, bytesused, state);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t rk3288_vdpu_irq(int irq, void *dev_id)
-{
-       struct rockchip_vpu_dev *vpu = dev_id;
-       enum vb2_buffer_state state;
-       u32 status;
-
-       status = vdpu_read(vpu, VDPU_REG_INTERRUPT);
-       state = (status & VDPU_REG_INTERRUPT_DEC_RDY_INT) ?
-               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
-
-       vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);
-       vdpu_write(vpu, VDPU_REG_CONFIG_DEC_CLK_GATE_E, VDPU_REG_CONFIG);
-
-       rockchip_vpu_irq_done(vpu, 0, state);
-
-       return IRQ_HANDLED;
-}
-
-static int rk3288_vpu_hw_init(struct rockchip_vpu_dev *vpu)
-{
-       /* Bump ACLK to max. possible freq. to improve performance. */
-       clk_set_rate(vpu->clocks[0].clk, RK3288_ACLK_MAX_FREQ);
-       return 0;
-}
-
-static void rk3288_vpu_enc_reset(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-
-       vepu_write(vpu, VEPU_REG_INTERRUPT_DIS_BIT, VEPU_REG_INTERRUPT);
-       vepu_write(vpu, 0, VEPU_REG_ENC_CTRL);
-       vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);
-}
-
-static void rk3288_vpu_dec_reset(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-
-       vdpu_write(vpu, VDPU_REG_INTERRUPT_DEC_IRQ_DIS, VDPU_REG_INTERRUPT);
-       vdpu_write(vpu, VDPU_REG_CONFIG_DEC_CLK_GATE_E, VDPU_REG_CONFIG);
-       vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET);
-}
-
-/*
- * Supported codec ops.
- */
-
-static const struct rockchip_vpu_codec_ops rk3288_vpu_codec_ops[] = {
-       [RK_VPU_MODE_JPEG_ENC] = {
-               .run = rk3288_vpu_jpeg_enc_run,
-               .reset = rk3288_vpu_enc_reset,
-               .init = rockchip_vpu_jpeg_enc_init,
-               .exit = rockchip_vpu_jpeg_enc_exit,
-       },
-       [RK_VPU_MODE_MPEG2_DEC] = {
-               .run = rk3288_vpu_mpeg2_dec_run,
-               .reset = rk3288_vpu_dec_reset,
-               .init = rockchip_vpu_mpeg2_dec_init,
-               .exit = rockchip_vpu_mpeg2_dec_exit,
-       },
-};
-
-/*
- * VPU variant.
- */
-
-const struct rockchip_vpu_variant rk3288_vpu_variant = {
-       .enc_offset = 0x0,
-       .enc_fmts = rk3288_vpu_enc_fmts,
-       .num_enc_fmts = ARRAY_SIZE(rk3288_vpu_enc_fmts),
-       .dec_offset = 0x400,
-       .dec_fmts = rk3288_vpu_dec_fmts,
-       .num_dec_fmts = ARRAY_SIZE(rk3288_vpu_dec_fmts),
-       .codec = RK_VPU_JPEG_ENCODER | RK_VPU_MPEG2_DECODER,
-       .codec_ops = rk3288_vpu_codec_ops,
-       .vepu_irq = rk3288_vepu_irq,
-       .vdpu_irq = rk3288_vdpu_irq,
-       .init = rk3288_vpu_hw_init,
-       .clk_names = {"aclk", "hclk"},
-       .num_clocks = 2
-};
diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c
deleted file mode 100644 (file)
index 68176e9..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- */
-
-#include <asm/unaligned.h>
-#include <media/v4l2-mem2mem.h>
-#include "rockchip_vpu_jpeg.h"
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_v4l2.h"
-#include "rockchip_vpu_hw.h"
-#include "rk3288_vpu_regs.h"
-
-#define VEPU_JPEG_QUANT_TABLE_COUNT 16
-
-static void rk3288_vpu_set_src_img_ctrl(struct rockchip_vpu_dev *vpu,
-                                       struct rockchip_vpu_ctx *ctx)
-{
-       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
-       u32 reg;
-
-       reg = VEPU_REG_IN_IMG_CTRL_ROW_LEN(pix_fmt->width)
-               | VEPU_REG_IN_IMG_CTRL_OVRFLR_D4(0)
-               | VEPU_REG_IN_IMG_CTRL_OVRFLB_D4(0)
-               | VEPU_REG_IN_IMG_CTRL_FMT(ctx->vpu_src_fmt->enc_fmt);
-       vepu_write_relaxed(vpu, reg, VEPU_REG_IN_IMG_CTRL);
-}
-
-static void rk3288_vpu_jpeg_enc_set_buffers(struct rockchip_vpu_dev *vpu,
-                                           struct rockchip_vpu_ctx *ctx,
-                                           struct vb2_buffer *src_buf)
-{
-       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
-       dma_addr_t src[3];
-
-       WARN_ON(pix_fmt->num_planes > 3);
-
-       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.dma,
-                          VEPU_REG_ADDR_OUTPUT_STREAM);
-       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.size,
-                          VEPU_REG_STR_BUF_LIMIT);
-
-       if (pix_fmt->num_planes == 1) {
-               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-               /* single plane formats we supported are all interlaced */
-               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
-       } else if (pix_fmt->num_planes == 2) {
-               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
-               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
-               vepu_write_relaxed(vpu, src[1], VEPU_REG_ADDR_IN_PLANE_1);
-       } else {
-               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
-               src[2] = vb2_dma_contig_plane_dma_addr(src_buf, 2);
-               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
-               vepu_write_relaxed(vpu, src[1], VEPU_REG_ADDR_IN_PLANE_1);
-               vepu_write_relaxed(vpu, src[2], VEPU_REG_ADDR_IN_PLANE_2);
-       }
-}
-
-static void
-rk3288_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,
-                              unsigned char *luma_qtable,
-                              unsigned char *chroma_qtable)
-{
-       u32 reg, i;
-
-       for (i = 0; i < VEPU_JPEG_QUANT_TABLE_COUNT; i++) {
-               reg = get_unaligned_be32(&luma_qtable[i]);
-               vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_LUMA_QUAT(i));
-
-               reg = get_unaligned_be32(&chroma_qtable[i]);
-               vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_CHROMA_QUAT(i));
-       }
-}
-
-void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *src_buf, *dst_buf;
-       struct rockchip_vpu_jpeg_ctx jpeg_ctx;
-       u32 reg;
-
-       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-
-       memset(&jpeg_ctx, 0, sizeof(jpeg_ctx));
-       jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
-       jpeg_ctx.width = ctx->dst_fmt.width;
-       jpeg_ctx.height = ctx->dst_fmt.height;
-       jpeg_ctx.quality = ctx->jpeg_quality;
-       rockchip_vpu_jpeg_header_assemble(&jpeg_ctx);
-
-       /* Switch to JPEG encoder mode before writing registers */
-       vepu_write_relaxed(vpu, VEPU_REG_ENC_CTRL_ENC_MODE_JPEG,
-                          VEPU_REG_ENC_CTRL);
-
-       rk3288_vpu_set_src_img_ctrl(vpu, ctx);
-       rk3288_vpu_jpeg_enc_set_buffers(vpu, ctx, &src_buf->vb2_buf);
-       rk3288_vpu_jpeg_enc_set_qtable(vpu,
-                                      rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 0),
-                                      rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 1));
-
-       reg = VEPU_REG_AXI_CTRL_OUTPUT_SWAP16
-               | VEPU_REG_AXI_CTRL_INPUT_SWAP16
-               | VEPU_REG_AXI_CTRL_BURST_LEN(16)
-               | VEPU_REG_AXI_CTRL_OUTPUT_SWAP32
-               | VEPU_REG_AXI_CTRL_INPUT_SWAP32
-               | VEPU_REG_AXI_CTRL_OUTPUT_SWAP8
-               | VEPU_REG_AXI_CTRL_INPUT_SWAP8;
-       /* Make sure that all registers are written at this point. */
-       vepu_write(vpu, reg, VEPU_REG_AXI_CTRL);
-
-       reg = VEPU_REG_ENC_CTRL_WIDTH(JPEG_MB_WIDTH(ctx->src_fmt.width))
-               | VEPU_REG_ENC_CTRL_HEIGHT(JPEG_MB_HEIGHT(ctx->src_fmt.height))
-               | VEPU_REG_ENC_CTRL_ENC_MODE_JPEG
-               | VEPU_REG_ENC_PIC_INTRA
-               | VEPU_REG_ENC_CTRL_EN_BIT;
-       /* Kick the watchdog and start encoding */
-       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
-       vepu_write(vpu, reg, VEPU_REG_ENC_CTRL);
-}
diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c
deleted file mode 100644 (file)
index e9eee47..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- */
-
-#include <asm/unaligned.h>
-#include <linux/bitfield.h>
-#include <media/v4l2-mem2mem.h>
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_hw.h"
-
-#define VDPU_SWREG(nr)                 ((nr) * 4)
-
-#define VDPU_REG_RLC_VLC_BASE          VDPU_SWREG(12)
-#define VDPU_REG_DEC_OUT_BASE          VDPU_SWREG(13)
-#define VDPU_REG_REFER0_BASE           VDPU_SWREG(14)
-#define VDPU_REG_REFER1_BASE           VDPU_SWREG(15)
-#define VDPU_REG_REFER2_BASE           VDPU_SWREG(16)
-#define VDPU_REG_REFER3_BASE           VDPU_SWREG(17)
-#define VDPU_REG_QTABLE_BASE           VDPU_SWREG(40)
-#define VDPU_REG_DEC_E(v)              ((v) ? BIT(0) : 0)
-
-#define VDPU_REG_DEC_AXI_RD_ID(v)      (((v) << 24) & GENMASK(31, 24))
-#define VDPU_REG_DEC_TIMEOUT_E(v)      ((v) ? BIT(23) : 0)
-#define VDPU_REG_DEC_STRSWAP32_E(v)    ((v) ? BIT(22) : 0)
-#define VDPU_REG_DEC_STRENDIAN_E(v)    ((v) ? BIT(21) : 0)
-#define VDPU_REG_DEC_INSWAP32_E(v)     ((v) ? BIT(20) : 0)
-#define VDPU_REG_DEC_OUTSWAP32_E(v)    ((v) ? BIT(19) : 0)
-#define VDPU_REG_DEC_DATA_DISC_E(v)    ((v) ? BIT(18) : 0)
-#define VDPU_REG_DEC_LATENCY(v)                (((v) << 11) & GENMASK(16, 11))
-#define VDPU_REG_DEC_CLK_GATE_E(v)     ((v) ? BIT(10) : 0)
-#define VDPU_REG_DEC_IN_ENDIAN(v)      ((v) ? BIT(9) : 0)
-#define VDPU_REG_DEC_OUT_ENDIAN(v)     ((v) ? BIT(8) : 0)
-#define VDPU_REG_DEC_ADV_PRE_DIS(v)    ((v) ? BIT(6) : 0)
-#define VDPU_REG_DEC_SCMD_DIS(v)       ((v) ? BIT(5) : 0)
-#define VDPU_REG_DEC_MAX_BURST(v)      (((v) << 0) & GENMASK(4, 0))
-
-#define VDPU_REG_DEC_MODE(v)           (((v) << 28) & GENMASK(31, 28))
-#define VDPU_REG_RLC_MODE_E(v)         ((v) ? BIT(27) : 0)
-#define VDPU_REG_PIC_INTERLACE_E(v)    ((v) ? BIT(23) : 0)
-#define VDPU_REG_PIC_FIELDMODE_E(v)    ((v) ? BIT(22) : 0)
-#define VDPU_REG_PIC_B_E(v)            ((v) ? BIT(21) : 0)
-#define VDPU_REG_PIC_INTER_E(v)                ((v) ? BIT(20) : 0)
-#define VDPU_REG_PIC_TOPFIELD_E(v)     ((v) ? BIT(19) : 0)
-#define VDPU_REG_FWD_INTERLACE_E(v)    ((v) ? BIT(18) : 0)
-#define VDPU_REG_FILTERING_DIS(v)      ((v) ? BIT(14) : 0)
-#define VDPU_REG_WRITE_MVS_E(v)                ((v) ? BIT(12) : 0)
-#define VDPU_REG_DEC_AXI_WR_ID(v)      (((v) << 0) & GENMASK(7, 0))
-
-#define VDPU_REG_PIC_MB_WIDTH(v)       (((v) << 23) & GENMASK(31, 23))
-#define VDPU_REG_PIC_MB_HEIGHT_P(v)    (((v) << 11) & GENMASK(18, 11))
-#define VDPU_REG_ALT_SCAN_E(v)         ((v) ? BIT(6) : 0)
-#define VDPU_REG_TOPFIELDFIRST_E(v)    ((v) ? BIT(5) : 0)
-
-#define VDPU_REG_STRM_START_BIT(v)     (((v) << 26) & GENMASK(31, 26))
-#define VDPU_REG_QSCALE_TYPE(v)                ((v) ? BIT(24) : 0)
-#define VDPU_REG_CON_MV_E(v)           ((v) ? BIT(4) : 0)
-#define VDPU_REG_INTRA_DC_PREC(v)      (((v) << 2) & GENMASK(3, 2))
-#define VDPU_REG_INTRA_VLC_TAB(v)      ((v) ? BIT(1) : 0)
-#define VDPU_REG_FRAME_PRED_DCT(v)     ((v) ? BIT(0) : 0)
-
-#define VDPU_REG_INIT_QP(v)            (((v) << 25) & GENMASK(30, 25))
-#define VDPU_REG_STREAM_LEN(v)         (((v) << 0) & GENMASK(23, 0))
-
-#define VDPU_REG_ALT_SCAN_FLAG_E(v)    ((v) ? BIT(19) : 0)
-#define VDPU_REG_FCODE_FWD_HOR(v)      (((v) << 15) & GENMASK(18, 15))
-#define VDPU_REG_FCODE_FWD_VER(v)      (((v) << 11) & GENMASK(14, 11))
-#define VDPU_REG_FCODE_BWD_HOR(v)      (((v) << 7) & GENMASK(10, 7))
-#define VDPU_REG_FCODE_BWD_VER(v)      (((v) << 3) & GENMASK(6, 3))
-#define VDPU_REG_MV_ACCURACY_FWD(v)    ((v) ? BIT(2) : 0)
-#define VDPU_REG_MV_ACCURACY_BWD(v)    ((v) ? BIT(1) : 0)
-
-#define VDPU_REG_STARTMB_X(v)          (((v) << 23) & GENMASK(31, 23))
-#define VDPU_REG_STARTMB_Y(v)          (((v) << 15) & GENMASK(22, 15))
-
-#define VDPU_REG_APF_THRESHOLD(v)      (((v) << 0) & GENMASK(13, 0))
-
-#define PICT_TOP_FIELD     1
-#define PICT_BOTTOM_FIELD  2
-#define PICT_FRAME         3
-
-static void
-rk3288_vpu_mpeg2_dec_set_quantization(struct rockchip_vpu_dev *vpu,
-                                     struct rockchip_vpu_ctx *ctx)
-{
-       struct v4l2_ctrl_mpeg2_quantization *quantization;
-
-       quantization = rockchip_vpu_get_ctrl(ctx,
-                               V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION);
-       rockchip_vpu_mpeg2_dec_copy_qtable(ctx->mpeg2_dec.qtable.cpu,
-                                          quantization);
-       vdpu_write_relaxed(vpu, ctx->mpeg2_dec.qtable.dma,
-                          VDPU_REG_QTABLE_BASE);
-}
-
-static void
-rk3288_vpu_mpeg2_dec_set_buffers(struct rockchip_vpu_dev *vpu,
-                                struct rockchip_vpu_ctx *ctx,
-                                struct vb2_buffer *src_buf,
-                                struct vb2_buffer *dst_buf,
-                                const struct v4l2_mpeg2_sequence *sequence,
-                                const struct v4l2_mpeg2_picture *picture,
-                                const struct v4l2_ctrl_mpeg2_slice_params *slice_params)
-{
-       dma_addr_t forward_addr = 0, backward_addr = 0;
-       dma_addr_t current_addr, addr;
-       struct vb2_queue *vq;
-
-       vq = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);
-
-       switch (picture->picture_coding_type) {
-       case V4L2_MPEG2_PICTURE_CODING_TYPE_B:
-               backward_addr = rockchip_vpu_get_ref(vq,
-                                               slice_params->backward_ref_ts);
-               /* fall-through */
-       case V4L2_MPEG2_PICTURE_CODING_TYPE_P:
-               forward_addr = rockchip_vpu_get_ref(vq,
-                                               slice_params->forward_ref_ts);
-       }
-
-       /* Source bitstream buffer */
-       addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-       vdpu_write_relaxed(vpu, addr, VDPU_REG_RLC_VLC_BASE);
-
-       /* Destination frame buffer */
-       addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
-       current_addr = addr;
-
-       if (picture->picture_structure == PICT_BOTTOM_FIELD)
-               addr += ALIGN(ctx->dst_fmt.width, 16);
-       vdpu_write_relaxed(vpu, addr, VDPU_REG_DEC_OUT_BASE);
-
-       if (!forward_addr)
-               forward_addr = current_addr;
-       if (!backward_addr)
-               backward_addr = current_addr;
-
-       /* Set forward ref frame (top/bottom field) */
-       if (picture->picture_structure == PICT_FRAME ||
-           picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B ||
-           (picture->picture_structure == PICT_TOP_FIELD &&
-            picture->top_field_first) ||
-           (picture->picture_structure == PICT_BOTTOM_FIELD &&
-            !picture->top_field_first)) {
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER0_BASE);
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER1_BASE);
-       } else if (picture->picture_structure == PICT_TOP_FIELD) {
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER0_BASE);
-               vdpu_write_relaxed(vpu, current_addr, VDPU_REG_REFER1_BASE);
-       } else if (picture->picture_structure == PICT_BOTTOM_FIELD) {
-               vdpu_write_relaxed(vpu, current_addr, VDPU_REG_REFER0_BASE);
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER1_BASE);
-       }
-
-       /* Set backward ref frame (top/bottom field) */
-       vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER2_BASE);
-       vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER3_BASE);
-}
-
-void rk3288_vpu_mpeg2_dec_run(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *src_buf, *dst_buf;
-       const struct v4l2_ctrl_mpeg2_slice_params *slice_params;
-       const struct v4l2_mpeg2_sequence *sequence;
-       const struct v4l2_mpeg2_picture *picture;
-       u32 reg;
-
-       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-
-       /* Apply request controls if any */
-       v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
-                               &ctx->ctrl_handler);
-
-       slice_params = rockchip_vpu_get_ctrl(ctx,
-                               V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS);
-       sequence = &slice_params->sequence;
-       picture = &slice_params->picture;
-
-       reg = VDPU_REG_DEC_AXI_RD_ID(0) |
-             VDPU_REG_DEC_TIMEOUT_E(1) |
-             VDPU_REG_DEC_STRSWAP32_E(1) |
-             VDPU_REG_DEC_STRENDIAN_E(1) |
-             VDPU_REG_DEC_INSWAP32_E(1) |
-             VDPU_REG_DEC_OUTSWAP32_E(1) |
-             VDPU_REG_DEC_DATA_DISC_E(0) |
-             VDPU_REG_DEC_LATENCY(0) |
-             VDPU_REG_DEC_CLK_GATE_E(1) |
-             VDPU_REG_DEC_IN_ENDIAN(1) |
-             VDPU_REG_DEC_OUT_ENDIAN(1) |
-             VDPU_REG_DEC_ADV_PRE_DIS(0) |
-             VDPU_REG_DEC_SCMD_DIS(0) |
-             VDPU_REG_DEC_MAX_BURST(16);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(2));
-
-       reg = VDPU_REG_DEC_MODE(5) |
-             VDPU_REG_RLC_MODE_E(0) |
-             VDPU_REG_PIC_INTERLACE_E(!sequence->progressive_sequence) |
-             VDPU_REG_PIC_FIELDMODE_E(picture->picture_structure != PICT_FRAME) |
-             VDPU_REG_PIC_B_E(picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B) |
-             VDPU_REG_PIC_INTER_E(picture->picture_coding_type != V4L2_MPEG2_PICTURE_CODING_TYPE_I) |
-             VDPU_REG_PIC_TOPFIELD_E(picture->picture_structure == PICT_TOP_FIELD) |
-             VDPU_REG_FWD_INTERLACE_E(0) |
-             VDPU_REG_FILTERING_DIS(1) |
-             VDPU_REG_WRITE_MVS_E(0) |
-             VDPU_REG_DEC_AXI_WR_ID(0);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(3));
-
-       reg = VDPU_REG_PIC_MB_WIDTH(MPEG2_MB_WIDTH(ctx->dst_fmt.width)) |
-             VDPU_REG_PIC_MB_HEIGHT_P(MPEG2_MB_HEIGHT(ctx->dst_fmt.height)) |
-             VDPU_REG_ALT_SCAN_E(picture->alternate_scan) |
-             VDPU_REG_TOPFIELDFIRST_E(picture->top_field_first);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(4));
-
-       reg = VDPU_REG_STRM_START_BIT(slice_params->data_bit_offset) |
-             VDPU_REG_QSCALE_TYPE(picture->q_scale_type) |
-             VDPU_REG_CON_MV_E(picture->concealment_motion_vectors) |
-             VDPU_REG_INTRA_DC_PREC(picture->intra_dc_precision) |
-             VDPU_REG_INTRA_VLC_TAB(picture->intra_vlc_format) |
-             VDPU_REG_FRAME_PRED_DCT(picture->frame_pred_frame_dct);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(5));
-
-       reg = VDPU_REG_INIT_QP(1) |
-             VDPU_REG_STREAM_LEN(slice_params->bit_size >> 3);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(6));
-
-       reg = VDPU_REG_ALT_SCAN_FLAG_E(picture->alternate_scan) |
-             VDPU_REG_FCODE_FWD_HOR(picture->f_code[0][0]) |
-             VDPU_REG_FCODE_FWD_VER(picture->f_code[0][1]) |
-             VDPU_REG_FCODE_BWD_HOR(picture->f_code[1][0]) |
-             VDPU_REG_FCODE_BWD_VER(picture->f_code[1][1]) |
-             VDPU_REG_MV_ACCURACY_FWD(1) |
-             VDPU_REG_MV_ACCURACY_BWD(1);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(18));
-
-       reg = VDPU_REG_STARTMB_X(0) |
-             VDPU_REG_STARTMB_Y(0);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(48));
-
-       reg = VDPU_REG_APF_THRESHOLD(8);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(55));
-
-       rk3288_vpu_mpeg2_dec_set_quantization(vpu, ctx);
-
-       rk3288_vpu_mpeg2_dec_set_buffers(vpu, ctx, &src_buf->vb2_buf,
-                                        &dst_buf->vb2_buf,
-                                        sequence, picture, slice_params);
-
-       /* Controls no longer in-use, we can complete them */
-       v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req,
-                                  &ctx->ctrl_handler);
-
-       /* Kick the watchdog and start decoding */
-       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
-
-       reg = VDPU_REG_DEC_E(1);
-       vdpu_write(vpu, reg, VDPU_SWREG(1));
-}
diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h b/drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h
deleted file mode 100644 (file)
index c9631b7..0000000
+++ /dev/null
@@ -1,443 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Rockchip VPU codec driver
- *
- * Copyright 2018 Google LLC.
- *     Tomasz Figa <tfiga@chromium.org>
- */
-
-#ifndef RK3288_VPU_REGS_H_
-#define RK3288_VPU_REGS_H_
-
-/* Encoder registers. */
-#define VEPU_REG_INTERRUPT                     0x004
-#define     VEPU_REG_INTERRUPT_FRAME_RDY       BIT(2)
-#define     VEPU_REG_INTERRUPT_DIS_BIT         BIT(1)
-#define     VEPU_REG_INTERRUPT_BIT             BIT(0)
-#define VEPU_REG_AXI_CTRL                      0x008
-#define     VEPU_REG_AXI_CTRL_OUTPUT_SWAP16    BIT(15)
-#define     VEPU_REG_AXI_CTRL_INPUT_SWAP16     BIT(14)
-#define     VEPU_REG_AXI_CTRL_BURST_LEN(x)     ((x) << 8)
-#define     VEPU_REG_AXI_CTRL_GATE_BIT         BIT(4)
-#define     VEPU_REG_AXI_CTRL_OUTPUT_SWAP32    BIT(3)
-#define     VEPU_REG_AXI_CTRL_INPUT_SWAP32     BIT(2)
-#define     VEPU_REG_AXI_CTRL_OUTPUT_SWAP8     BIT(1)
-#define     VEPU_REG_AXI_CTRL_INPUT_SWAP8      BIT(0)
-#define VEPU_REG_ADDR_OUTPUT_STREAM            0x014
-#define VEPU_REG_ADDR_OUTPUT_CTRL              0x018
-#define VEPU_REG_ADDR_REF_LUMA                 0x01c
-#define VEPU_REG_ADDR_REF_CHROMA               0x020
-#define VEPU_REG_ADDR_REC_LUMA                 0x024
-#define VEPU_REG_ADDR_REC_CHROMA               0x028
-#define VEPU_REG_ADDR_IN_PLANE_0               0x02c
-#define VEPU_REG_ADDR_IN_PLANE_1               0x030
-#define VEPU_REG_ADDR_IN_PLANE_2               0x034
-#define VEPU_REG_ENC_CTRL                      0x038
-#define     VEPU_REG_ENC_CTRL_TIMEOUT_EN       BIT(31)
-#define     VEPU_REG_ENC_CTRL_NAL_MODE_BIT     BIT(29)
-#define     VEPU_REG_ENC_CTRL_WIDTH(w)         ((w) << 19)
-#define     VEPU_REG_ENC_CTRL_HEIGHT(h)                ((h) << 10)
-#define     VEPU_REG_ENC_PIC_INTER             (0x0 << 3)
-#define     VEPU_REG_ENC_PIC_INTRA             (0x1 << 3)
-#define     VEPU_REG_ENC_PIC_MVCINTER          (0x2 << 3)
-#define     VEPU_REG_ENC_CTRL_ENC_MODE_H264    (0x3 << 1)
-#define     VEPU_REG_ENC_CTRL_ENC_MODE_JPEG    (0x2 << 1)
-#define     VEPU_REG_ENC_CTRL_ENC_MODE_VP8     (0x1 << 1)
-#define     VEPU_REG_ENC_CTRL_EN_BIT           BIT(0)
-#define VEPU_REG_IN_IMG_CTRL                   0x03c
-#define     VEPU_REG_IN_IMG_CTRL_ROW_LEN(x)    ((x) << 12)
-#define     VEPU_REG_IN_IMG_CTRL_OVRFLR_D4(x)  ((x) << 10)
-#define     VEPU_REG_IN_IMG_CTRL_OVRFLB_D4(x)  ((x) << 6)
-#define     VEPU_REG_IN_IMG_CTRL_FMT(x)                ((x) << 2)
-#define VEPU_REG_ENC_CTRL0                     0x040
-#define    VEPU_REG_ENC_CTRL0_INIT_QP(x)               ((x) << 26)
-#define    VEPU_REG_ENC_CTRL0_SLICE_ALPHA(x)           ((x) << 22)
-#define    VEPU_REG_ENC_CTRL0_SLICE_BETA(x)            ((x) << 18)
-#define    VEPU_REG_ENC_CTRL0_CHROMA_QP_OFFSET(x)      ((x) << 13)
-#define    VEPU_REG_ENC_CTRL0_FILTER_DIS(x)            ((x) << 5)
-#define    VEPU_REG_ENC_CTRL0_IDR_PICID(x)             ((x) << 1)
-#define    VEPU_REG_ENC_CTRL0_CONSTR_INTRA_PRED        BIT(0)
-#define VEPU_REG_ENC_CTRL1                     0x044
-#define    VEPU_REG_ENC_CTRL1_PPS_ID(x)                        ((x) << 24)
-#define    VEPU_REG_ENC_CTRL1_INTRA_PRED_MODE(x)       ((x) << 16)
-#define    VEPU_REG_ENC_CTRL1_FRAME_NUM(x)             ((x))
-#define VEPU_REG_ENC_CTRL2                     0x048
-#define    VEPU_REG_ENC_CTRL2_DEBLOCKING_FILETER_MODE(x)       ((x) << 30)
-#define    VEPU_REG_ENC_CTRL2_H264_SLICE_SIZE(x)               ((x) << 23)
-#define    VEPU_REG_ENC_CTRL2_DISABLE_QUARTER_PIXMV            BIT(22)
-#define    VEPU_REG_ENC_CTRL2_TRANS8X8_MODE_EN                 BIT(21)
-#define    VEPU_REG_ENC_CTRL2_CABAC_INIT_IDC(x)                        ((x) << 19)
-#define    VEPU_REG_ENC_CTRL2_ENTROPY_CODING_MODE              BIT(18)
-#define    VEPU_REG_ENC_CTRL2_H264_INTER4X4_MODE               BIT(17)
-#define    VEPU_REG_ENC_CTRL2_H264_STREAM_MODE                 BIT(16)
-#define    VEPU_REG_ENC_CTRL2_INTRA16X16_MODE(x)               ((x))
-#define VEPU_REG_ENC_CTRL3                     0x04c
-#define    VEPU_REG_ENC_CTRL3_MUTIMV_EN                        BIT(30)
-#define    VEPU_REG_ENC_CTRL3_MV_PENALTY_1_4P(x)       ((x) << 20)
-#define    VEPU_REG_ENC_CTRL3_MV_PENALTY_4P(x)         ((x) << 10)
-#define    VEPU_REG_ENC_CTRL3_MV_PENALTY_1P(x)         ((x))
-#define VEPU_REG_ENC_CTRL4                     0x050
-#define    VEPU_REG_ENC_CTRL4_MV_PENALTY_16X8_8X16(x)  ((x) << 20)
-#define    VEPU_REG_ENC_CTRL4_MV_PENALTY_8X8(x)                ((x) << 10)
-#define    VEPU_REG_ENC_CTRL4_8X4_4X8(x)               ((x))
-#define VEPU_REG_ENC_CTRL5                     0x054
-#define    VEPU_REG_ENC_CTRL5_MACROBLOCK_PENALTY(x)    ((x) << 24)
-#define    VEPU_REG_ENC_CTRL5_COMPLETE_SLICES(x)       ((x) << 16)
-#define    VEPU_REG_ENC_CTRL5_INTER_MODE(x)            ((x))
-#define VEPU_REG_STR_HDR_REM_MSB               0x058
-#define VEPU_REG_STR_HDR_REM_LSB               0x05c
-#define VEPU_REG_STR_BUF_LIMIT                 0x060
-#define VEPU_REG_MAD_CTRL                      0x064
-#define    VEPU_REG_MAD_CTRL_QP_ADJUST(x)      ((x) << 28)
-#define    VEPU_REG_MAD_CTRL_MAD_THREDHOLD(x)  ((x) << 22)
-#define    VEPU_REG_MAD_CTRL_QP_SUM_DIV2(x)    ((x))
-#define VEPU_REG_ADDR_VP8_PROB_CNT             0x068
-#define VEPU_REG_QP_VAL                                0x06c
-#define    VEPU_REG_QP_VAL_LUM(x)              ((x) << 26)
-#define    VEPU_REG_QP_VAL_MAX(x)              ((x) << 20)
-#define    VEPU_REG_QP_VAL_MIN(x)              ((x) << 14)
-#define    VEPU_REG_QP_VAL_CHECKPOINT_DISTAN(x)        ((x))
-#define VEPU_REG_VP8_QP_VAL(i)                 (0x06c + ((i) * 0x4))
-#define VEPU_REG_CHECKPOINT(i)                 (0x070 + ((i) * 0x4))
-#define     VEPU_REG_CHECKPOINT_CHECK0(x)      (((x) & 0xffff))
-#define     VEPU_REG_CHECKPOINT_CHECK1(x)      (((x) & 0xffff) << 16)
-#define     VEPU_REG_CHECKPOINT_RESULT(x)      ((((x) >> (16 - 16 \
-                                                * (i & 1))) & 0xffff) \
-                                                * 32)
-#define VEPU_REG_CHKPT_WORD_ERR(i)             (0x084 + ((i) * 0x4))
-#define     VEPU_REG_CHKPT_WORD_ERR_CHK0(x)    (((x) & 0xffff))
-#define     VEPU_REG_CHKPT_WORD_ERR_CHK1(x)    (((x) & 0xffff) << 16)
-#define VEPU_REG_VP8_BOOL_ENC                  0x08c
-#define VEPU_REG_CHKPT_DELTA_QP                        0x090
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK0(x)    (((x) & 0x0f) << 0)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK1(x)    (((x) & 0x0f) << 4)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK2(x)    (((x) & 0x0f) << 8)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK3(x)    (((x) & 0x0f) << 12)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK4(x)    (((x) & 0x0f) << 16)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK5(x)    (((x) & 0x0f) << 20)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK6(x)    (((x) & 0x0f) << 24)
-#define VEPU_REG_VP8_CTRL0                     0x090
-#define VEPU_REG_RLC_CTRL                      0x094
-#define     VEPU_REG_RLC_CTRL_STR_OFFS_SHIFT   23
-#define     VEPU_REG_RLC_CTRL_STR_OFFS_MASK    (0x3f << 23)
-#define     VEPU_REG_RLC_CTRL_RLC_SUM(x)       ((x))
-#define VEPU_REG_MB_CTRL                       0x098
-#define     VEPU_REG_MB_CNT_OUT(x)             (((x) & 0xffff))
-#define     VEPU_REG_MB_CNT_SET(x)             (((x) & 0xffff) << 16)
-#define VEPU_REG_ADDR_NEXT_PIC                 0x09c
-#define        VEPU_REG_JPEG_LUMA_QUAT(i)              (0x100 + ((i) * 0x4))
-#define        VEPU_REG_JPEG_CHROMA_QUAT(i)            (0x140 + ((i) * 0x4))
-#define VEPU_REG_STABILIZATION_OUTPUT          0x0A0
-#define VEPU_REG_ADDR_CABAC_TBL                        0x0cc
-#define VEPU_REG_ADDR_MV_OUT                   0x0d0
-#define VEPU_REG_RGB_YUV_COEFF(i)              (0x0d4 + ((i) * 0x4))
-#define VEPU_REG_RGB_MASK_MSB                  0x0dc
-#define VEPU_REG_INTRA_AREA_CTRL               0x0e0
-#define VEPU_REG_CIR_INTRA_CTRL                        0x0e4
-#define VEPU_REG_INTRA_SLICE_BITMAP(i)         (0x0e8 + ((i) * 0x4))
-#define VEPU_REG_ADDR_VP8_DCT_PART(i)          (0x0e8 + ((i) * 0x4))
-#define VEPU_REG_FIRST_ROI_AREA                        0x0f0
-#define VEPU_REG_SECOND_ROI_AREA               0x0f4
-#define VEPU_REG_MVC_CTRL                      0x0f8
-#define        VEPU_REG_MVC_CTRL_MV16X16_FAVOR(x)      ((x) << 28)
-#define VEPU_REG_VP8_INTRA_PENALTY(i)          (0x100 + ((i) * 0x4))
-#define VEPU_REG_ADDR_VP8_SEG_MAP              0x11c
-#define VEPU_REG_VP8_SEG_QP(i)                 (0x120 + ((i) * 0x4))
-#define VEPU_REG_DMV_4P_1P_PENALTY(i)          (0x180 + ((i) * 0x4))
-#define     VEPU_REG_DMV_4P_1P_PENALTY_BIT(x, i)       ((x) << (i) * 8)
-#define VEPU_REG_DMV_QPEL_PENALTY(i)           (0x200 + ((i) * 0x4))
-#define     VEPU_REG_DMV_QPEL_PENALTY_BIT(x, i)        ((x) << (i) * 8)
-#define VEPU_REG_VP8_CTRL1                     0x280
-#define VEPU_REG_VP8_BIT_COST_GOLDEN           0x284
-#define VEPU_REG_VP8_LOOP_FLT_DELTA(i)         (0x288 + ((i) * 0x4))
-
-/* Decoder registers. */
-#define VDPU_REG_INTERRUPT                     0x004
-#define     VDPU_REG_INTERRUPT_DEC_PIC_INF             BIT(24)
-#define     VDPU_REG_INTERRUPT_DEC_TIMEOUT             BIT(18)
-#define     VDPU_REG_INTERRUPT_DEC_SLICE_INT           BIT(17)
-#define     VDPU_REG_INTERRUPT_DEC_ERROR_INT           BIT(16)
-#define     VDPU_REG_INTERRUPT_DEC_ASO_INT             BIT(15)
-#define     VDPU_REG_INTERRUPT_DEC_BUFFER_INT          BIT(14)
-#define     VDPU_REG_INTERRUPT_DEC_BUS_INT             BIT(13)
-#define     VDPU_REG_INTERRUPT_DEC_RDY_INT             BIT(12)
-#define     VDPU_REG_INTERRUPT_DEC_IRQ                 BIT(8)
-#define     VDPU_REG_INTERRUPT_DEC_IRQ_DIS             BIT(4)
-#define     VDPU_REG_INTERRUPT_DEC_E                   BIT(0)
-#define VDPU_REG_CONFIG                                0x008
-#define     VDPU_REG_CONFIG_DEC_AXI_RD_ID(x)           (((x) & 0xff) << 24)
-#define     VDPU_REG_CONFIG_DEC_TIMEOUT_E              BIT(23)
-#define     VDPU_REG_CONFIG_DEC_STRSWAP32_E            BIT(22)
-#define     VDPU_REG_CONFIG_DEC_STRENDIAN_E            BIT(21)
-#define     VDPU_REG_CONFIG_DEC_INSWAP32_E             BIT(20)
-#define     VDPU_REG_CONFIG_DEC_OUTSWAP32_E            BIT(19)
-#define     VDPU_REG_CONFIG_DEC_DATA_DISC_E            BIT(18)
-#define     VDPU_REG_CONFIG_TILED_MODE_MSB             BIT(17)
-#define     VDPU_REG_CONFIG_DEC_OUT_TILED_E            BIT(17)
-#define     VDPU_REG_CONFIG_DEC_LATENCY(x)             (((x) & 0x3f) << 11)
-#define     VDPU_REG_CONFIG_DEC_CLK_GATE_E             BIT(10)
-#define     VDPU_REG_CONFIG_DEC_IN_ENDIAN              BIT(9)
-#define     VDPU_REG_CONFIG_DEC_OUT_ENDIAN             BIT(8)
-#define     VDPU_REG_CONFIG_PRIORITY_MODE(x)           (((x) & 0x7) << 5)
-#define     VDPU_REG_CONFIG_TILED_MODE_LSB             BIT(7)
-#define     VDPU_REG_CONFIG_DEC_ADV_PRE_DIS            BIT(6)
-#define     VDPU_REG_CONFIG_DEC_SCMD_DIS               BIT(5)
-#define     VDPU_REG_CONFIG_DEC_MAX_BURST(x)           (((x) & 0x1f) << 0)
-#define VDPU_REG_DEC_CTRL0                     0x00c
-#define     VDPU_REG_DEC_CTRL0_DEC_MODE(x)             (((x) & 0xf) << 28)
-#define     VDPU_REG_DEC_CTRL0_RLC_MODE_E              BIT(27)
-#define     VDPU_REG_DEC_CTRL0_SKIP_MODE               BIT(26)
-#define     VDPU_REG_DEC_CTRL0_DIVX3_E                 BIT(25)
-#define     VDPU_REG_DEC_CTRL0_PJPEG_E                 BIT(24)
-#define     VDPU_REG_DEC_CTRL0_PIC_INTERLACE_E         BIT(23)
-#define     VDPU_REG_DEC_CTRL0_PIC_FIELDMODE_E         BIT(22)
-#define     VDPU_REG_DEC_CTRL0_PIC_B_E                 BIT(21)
-#define     VDPU_REG_DEC_CTRL0_PIC_INTER_E             BIT(20)
-#define     VDPU_REG_DEC_CTRL0_PIC_TOPFIELD_E          BIT(19)
-#define     VDPU_REG_DEC_CTRL0_FWD_INTERLACE_E         BIT(18)
-#define     VDPU_REG_DEC_CTRL0_SORENSON_E              BIT(17)
-#define     VDPU_REG_DEC_CTRL0_REF_TOPFIELD_E          BIT(16)
-#define     VDPU_REG_DEC_CTRL0_DEC_OUT_DIS             BIT(15)
-#define     VDPU_REG_DEC_CTRL0_FILTERING_DIS           BIT(14)
-#define     VDPU_REG_DEC_CTRL0_WEBP_E                  BIT(13)
-#define     VDPU_REG_DEC_CTRL0_MVC_E                   BIT(13)
-#define     VDPU_REG_DEC_CTRL0_PIC_FIXED_QUANT         BIT(13)
-#define     VDPU_REG_DEC_CTRL0_WRITE_MVS_E             BIT(12)
-#define     VDPU_REG_DEC_CTRL0_REFTOPFIRST_E           BIT(11)
-#define     VDPU_REG_DEC_CTRL0_SEQ_MBAFF_E             BIT(10)
-#define     VDPU_REG_DEC_CTRL0_PICORD_COUNT_E          BIT(9)
-#define     VDPU_REG_DEC_CTRL0_DEC_AHB_HLOCK_E         BIT(8)
-#define     VDPU_REG_DEC_CTRL0_DEC_AXI_WR_ID(x)                (((x) & 0xff) << 0)
-#define VDPU_REG_DEC_CTRL1                     0x010
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_WIDTH(x)         (((x) & 0x1ff) << 23)
-#define     VDPU_REG_DEC_CTRL1_MB_WIDTH_OFF(x)         (((x) & 0xf) << 19)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(x)      (((x) & 0xff) << 11)
-#define     VDPU_REG_DEC_CTRL1_MB_HEIGHT_OFF(x)                (((x) & 0xf) << 7)
-#define     VDPU_REG_DEC_CTRL1_ALT_SCAN_E              BIT(6)
-#define     VDPU_REG_DEC_CTRL1_TOPFIELDFIRST_E         BIT(5)
-#define     VDPU_REG_DEC_CTRL1_REF_FRAMES(x)           (((x) & 0x1f) << 0)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_W_EXT(x)         (((x) & 0x7) << 3)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_H_EXT(x)         (((x) & 0x7) << 0)
-#define     VDPU_REG_DEC_CTRL1_PIC_REFER_FLAG          BIT(0)
-#define VDPU_REG_DEC_CTRL2                     0x014
-#define     VDPU_REG_DEC_CTRL2_STRM_START_BIT(x)       (((x) & 0x3f) << 26)
-#define     VDPU_REG_DEC_CTRL2_SYNC_MARKER_E           BIT(25)
-#define     VDPU_REG_DEC_CTRL2_TYPE1_QUANT_E           BIT(24)
-#define     VDPU_REG_DEC_CTRL2_CH_QP_OFFSET(x)         (((x) & 0x1f) << 19)
-#define     VDPU_REG_DEC_CTRL2_CH_QP_OFFSET2(x)                (((x) & 0x1f) << 14)
-#define     VDPU_REG_DEC_CTRL2_FIELDPIC_FLAG_E         BIT(0)
-#define     VDPU_REG_DEC_CTRL2_INTRADC_VLC_THR(x)      (((x) & 0x7) << 16)
-#define     VDPU_REG_DEC_CTRL2_VOP_TIME_INCR(x)                (((x) & 0xffff) << 0)
-#define     VDPU_REG_DEC_CTRL2_DQ_PROFILE              BIT(24)
-#define     VDPU_REG_DEC_CTRL2_DQBI_LEVEL              BIT(23)
-#define     VDPU_REG_DEC_CTRL2_RANGE_RED_FRM_E         BIT(22)
-#define     VDPU_REG_DEC_CTRL2_FAST_UVMC_E             BIT(20)
-#define     VDPU_REG_DEC_CTRL2_TRANSDCTAB              BIT(17)
-#define     VDPU_REG_DEC_CTRL2_TRANSACFRM(x)           (((x) & 0x3) << 15)
-#define     VDPU_REG_DEC_CTRL2_TRANSACFRM2(x)          (((x) & 0x3) << 13)
-#define     VDPU_REG_DEC_CTRL2_MB_MODE_TAB(x)          (((x) & 0x7) << 10)
-#define     VDPU_REG_DEC_CTRL2_MVTAB(x)                        (((x) & 0x7) << 7)
-#define     VDPU_REG_DEC_CTRL2_CBPTAB(x)               (((x) & 0x7) << 4)
-#define     VDPU_REG_DEC_CTRL2_2MV_BLK_PAT_TAB(x)      (((x) & 0x3) << 2)
-#define     VDPU_REG_DEC_CTRL2_4MV_BLK_PAT_TAB(x)      (((x) & 0x3) << 0)
-#define     VDPU_REG_DEC_CTRL2_QSCALE_TYPE             BIT(24)
-#define     VDPU_REG_DEC_CTRL2_CON_MV_E                        BIT(4)
-#define     VDPU_REG_DEC_CTRL2_INTRA_DC_PREC(x)                (((x) & 0x3) << 2)
-#define     VDPU_REG_DEC_CTRL2_INTRA_VLC_TAB           BIT(1)
-#define     VDPU_REG_DEC_CTRL2_FRAME_PRED_DCT          BIT(0)
-#define     VDPU_REG_DEC_CTRL2_JPEG_QTABLES(x)         (((x) & 0x3) << 11)
-#define     VDPU_REG_DEC_CTRL2_JPEG_MODE(x)            (((x) & 0x7) << 8)
-#define     VDPU_REG_DEC_CTRL2_JPEG_FILRIGHT_E         BIT(7)
-#define     VDPU_REG_DEC_CTRL2_JPEG_STREAM_ALL         BIT(6)
-#define     VDPU_REG_DEC_CTRL2_CR_AC_VLCTABLE          BIT(5)
-#define     VDPU_REG_DEC_CTRL2_CB_AC_VLCTABLE          BIT(4)
-#define     VDPU_REG_DEC_CTRL2_CR_DC_VLCTABLE          BIT(3)
-#define     VDPU_REG_DEC_CTRL2_CB_DC_VLCTABLE          BIT(2)
-#define     VDPU_REG_DEC_CTRL2_CR_DC_VLCTABLE3         BIT(1)
-#define     VDPU_REG_DEC_CTRL2_CB_DC_VLCTABLE3         BIT(0)
-#define     VDPU_REG_DEC_CTRL2_STRM1_START_BIT(x)      (((x) & 0x3f) << 18)
-#define     VDPU_REG_DEC_CTRL2_HUFFMAN_E               BIT(17)
-#define     VDPU_REG_DEC_CTRL2_MULTISTREAM_E           BIT(16)
-#define     VDPU_REG_DEC_CTRL2_BOOLEAN_VALUE(x)                (((x) & 0xff) << 8)
-#define     VDPU_REG_DEC_CTRL2_BOOLEAN_RANGE(x)                (((x) & 0xff) << 0)
-#define     VDPU_REG_DEC_CTRL2_ALPHA_OFFSET(x)         (((x) & 0x1f) << 5)
-#define     VDPU_REG_DEC_CTRL2_BETA_OFFSET(x)          (((x) & 0x1f) << 0)
-#define VDPU_REG_DEC_CTRL3                     0x018
-#define     VDPU_REG_DEC_CTRL3_START_CODE_E            BIT(31)
-#define     VDPU_REG_DEC_CTRL3_INIT_QP(x)              (((x) & 0x3f) << 25)
-#define     VDPU_REG_DEC_CTRL3_CH_8PIX_ILEAV_E         BIT(24)
-#define     VDPU_REG_DEC_CTRL3_STREAM_LEN_EXT(x)       (((x) & 0xff) << 24)
-#define     VDPU_REG_DEC_CTRL3_STREAM_LEN(x)           (((x) & 0xffffff) << 0)
-#define VDPU_REG_DEC_CTRL4                     0x01c
-#define     VDPU_REG_DEC_CTRL4_CABAC_E                 BIT(31)
-#define     VDPU_REG_DEC_CTRL4_BLACKWHITE_E            BIT(30)
-#define     VDPU_REG_DEC_CTRL4_DIR_8X8_INFER_E         BIT(29)
-#define     VDPU_REG_DEC_CTRL4_WEIGHT_PRED_E           BIT(28)
-#define     VDPU_REG_DEC_CTRL4_WEIGHT_BIPR_IDC(x)      (((x) & 0x3) << 26)
-#define     VDPU_REG_DEC_CTRL4_AVS_H264_H_EXT          BIT(25)
-#define     VDPU_REG_DEC_CTRL4_FRAMENUM_LEN(x)         (((x) & 0x1f) << 16)
-#define     VDPU_REG_DEC_CTRL4_FRAMENUM(x)             (((x) & 0xffff) << 0)
-#define     VDPU_REG_DEC_CTRL4_BITPLANE0_E             BIT(31)
-#define     VDPU_REG_DEC_CTRL4_BITPLANE1_E             BIT(30)
-#define     VDPU_REG_DEC_CTRL4_BITPLANE2_E             BIT(29)
-#define     VDPU_REG_DEC_CTRL4_ALT_PQUANT(x)           (((x) & 0x1f) << 24)
-#define     VDPU_REG_DEC_CTRL4_DQ_EDGES(x)             (((x) & 0xf) << 20)
-#define     VDPU_REG_DEC_CTRL4_TTMBF                   BIT(19)
-#define     VDPU_REG_DEC_CTRL4_PQINDEX(x)              (((x) & 0x1f) << 14)
-#define     VDPU_REG_DEC_CTRL4_VC1_HEIGHT_EXT          BIT(13)
-#define     VDPU_REG_DEC_CTRL4_BILIN_MC_E              BIT(12)
-#define     VDPU_REG_DEC_CTRL4_UNIQP_E                 BIT(11)
-#define     VDPU_REG_DEC_CTRL4_HALFQP_E                        BIT(10)
-#define     VDPU_REG_DEC_CTRL4_TTFRM(x)                        (((x) & 0x3) << 8)
-#define     VDPU_REG_DEC_CTRL4_2ND_BYTE_EMUL_E         BIT(7)
-#define     VDPU_REG_DEC_CTRL4_DQUANT_E                        BIT(6)
-#define     VDPU_REG_DEC_CTRL4_VC1_ADV_E               BIT(5)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_FILDOWN_E         BIT(26)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_WDIV8             BIT(25)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_HDIV8             BIT(24)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_AH(x)             (((x) & 0xf) << 20)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_AL(x)             (((x) & 0xf) << 16)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_SS(x)             (((x) & 0xff) << 8)
-#define     VDPU_REG_DEC_CTRL4_PJPEG_SE(x)             (((x) & 0xff) << 0)
-#define     VDPU_REG_DEC_CTRL4_DCT1_START_BIT(x)       (((x) & 0x3f) << 26)
-#define     VDPU_REG_DEC_CTRL4_DCT2_START_BIT(x)       (((x) & 0x3f) << 20)
-#define     VDPU_REG_DEC_CTRL4_CH_MV_RES               BIT(13)
-#define     VDPU_REG_DEC_CTRL4_INIT_DC_MATCH0(x)       (((x) & 0x7) << 9)
-#define     VDPU_REG_DEC_CTRL4_INIT_DC_MATCH1(x)       (((x) & 0x7) << 6)
-#define     VDPU_REG_DEC_CTRL4_VP7_VERSION             BIT(5)
-#define VDPU_REG_DEC_CTRL5                     0x020
-#define     VDPU_REG_DEC_CTRL5_CONST_INTRA_E           BIT(31)
-#define     VDPU_REG_DEC_CTRL5_FILT_CTRL_PRES          BIT(30)
-#define     VDPU_REG_DEC_CTRL5_RDPIC_CNT_PRES          BIT(29)
-#define     VDPU_REG_DEC_CTRL5_8X8TRANS_FLAG_E         BIT(28)
-#define     VDPU_REG_DEC_CTRL5_REFPIC_MK_LEN(x)                (((x) & 0x7ff) << 17)
-#define     VDPU_REG_DEC_CTRL5_IDR_PIC_E               BIT(16)
-#define     VDPU_REG_DEC_CTRL5_IDR_PIC_ID(x)           (((x) & 0xffff) << 0)
-#define     VDPU_REG_DEC_CTRL5_MV_SCALEFACTOR(x)       (((x) & 0xff) << 24)
-#define     VDPU_REG_DEC_CTRL5_REF_DIST_FWD(x)         (((x) & 0x1f) << 19)
-#define     VDPU_REG_DEC_CTRL5_REF_DIST_BWD(x)         (((x) & 0x1f) << 14)
-#define     VDPU_REG_DEC_CTRL5_LOOP_FILT_LIMIT(x)      (((x) & 0xf) << 14)
-#define     VDPU_REG_DEC_CTRL5_VARIANCE_TEST_E         BIT(13)
-#define     VDPU_REG_DEC_CTRL5_MV_THRESHOLD(x)         (((x) & 0x7) << 10)
-#define     VDPU_REG_DEC_CTRL5_VAR_THRESHOLD(x)                (((x) & 0x3ff) << 0)
-#define     VDPU_REG_DEC_CTRL5_DIVX_IDCT_E             BIT(8)
-#define     VDPU_REG_DEC_CTRL5_DIVX3_SLICE_SIZE(x)     (((x) & 0xff) << 0)
-#define     VDPU_REG_DEC_CTRL5_PJPEG_REST_FREQ(x)      (((x) & 0xffff) << 0)
-#define     VDPU_REG_DEC_CTRL5_RV_PROFILE(x)           (((x) & 0x3) << 30)
-#define     VDPU_REG_DEC_CTRL5_RV_OSV_QUANT(x)         (((x) & 0x3) << 28)
-#define     VDPU_REG_DEC_CTRL5_RV_FWD_SCALE(x)         (((x) & 0x3fff) << 14)
-#define     VDPU_REG_DEC_CTRL5_RV_BWD_SCALE(x)         (((x) & 0x3fff) << 0)
-#define     VDPU_REG_DEC_CTRL5_INIT_DC_COMP0(x)                (((x) & 0xffff) << 16)
-#define     VDPU_REG_DEC_CTRL5_INIT_DC_COMP1(x)                (((x) & 0xffff) << 0)
-#define VDPU_REG_DEC_CTRL6                     0x024
-#define     VDPU_REG_DEC_CTRL6_PPS_ID(x)               (((x) & 0xff) << 24)
-#define     VDPU_REG_DEC_CTRL6_REFIDX1_ACTIVE(x)       (((x) & 0x1f) << 19)
-#define     VDPU_REG_DEC_CTRL6_REFIDX0_ACTIVE(x)       (((x) & 0x1f) << 14)
-#define     VDPU_REG_DEC_CTRL6_POC_LENGTH(x)           (((x) & 0xff) << 0)
-#define     VDPU_REG_DEC_CTRL6_ICOMP0_E                        BIT(24)
-#define     VDPU_REG_DEC_CTRL6_ISCALE0(x)              (((x) & 0xff) << 16)
-#define     VDPU_REG_DEC_CTRL6_ISHIFT0(x)              (((x) & 0xffff) << 0)
-#define     VDPU_REG_DEC_CTRL6_STREAM1_LEN(x)          (((x) & 0xffffff) << 0)
-#define     VDPU_REG_DEC_CTRL6_PIC_SLICE_AM(x)         (((x) & 0x1fff) << 0)
-#define     VDPU_REG_DEC_CTRL6_COEFFS_PART_AM(x)       (((x) & 0xf) << 24)
-#define VDPU_REG_FWD_PIC(i)                    (0x028 + ((i) * 0x4))
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F5(x)         (((x) & 0x1f) << 25)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F4(x)         (((x) & 0x1f) << 20)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F3(x)         (((x) & 0x1f) << 15)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F2(x)         (((x) & 0x1f) << 10)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F1(x)         (((x) & 0x1f) << 5)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F0(x)         (((x) & 0x1f) << 0)
-#define     VDPU_REG_FWD_PIC1_ICOMP1_E                 BIT(24)
-#define     VDPU_REG_FWD_PIC1_ISCALE1(x)               (((x) & 0xff) << 16)
-#define     VDPU_REG_FWD_PIC1_ISHIFT1(x)               (((x) & 0xffff) << 0)
-#define     VDPU_REG_FWD_PIC1_SEGMENT_BASE(x)          ((x) << 0)
-#define     VDPU_REG_FWD_PIC1_SEGMENT_UPD_E            BIT(1)
-#define     VDPU_REG_FWD_PIC1_SEGMENT_E                        BIT(0)
-#define VDPU_REG_DEC_CTRL7                     0x02c
-#define     VDPU_REG_DEC_CTRL7_PINIT_RLIST_F15(x)      (((x) & 0x1f) << 25)
-#define     VDPU_REG_DEC_CTRL7_PINIT_RLIST_F14(x)      (((x) & 0x1f) << 20)
-#define     VDPU_REG_DEC_CTRL7_PINIT_RLIST_F13(x)      (((x) & 0x1f) << 15)
-#define     VDPU_REG_DEC_CTRL7_PINIT_RLIST_F12(x)      (((x) & 0x1f) << 10)
-#define     VDPU_REG_DEC_CTRL7_PINIT_RLIST_F11(x)      (((x) & 0x1f) << 5)
-#define     VDPU_REG_DEC_CTRL7_PINIT_RLIST_F10(x)      (((x) & 0x1f) << 0)
-#define     VDPU_REG_DEC_CTRL7_ICOMP2_E                        BIT(24)
-#define     VDPU_REG_DEC_CTRL7_ISCALE2(x)              (((x) & 0xff) << 16)
-#define     VDPU_REG_DEC_CTRL7_ISHIFT2(x)              (((x) & 0xffff) << 0)
-#define     VDPU_REG_DEC_CTRL7_DCT3_START_BIT(x)       (((x) & 0x3f) << 24)
-#define     VDPU_REG_DEC_CTRL7_DCT4_START_BIT(x)       (((x) & 0x3f) << 18)
-#define     VDPU_REG_DEC_CTRL7_DCT5_START_BIT(x)       (((x) & 0x3f) << 12)
-#define     VDPU_REG_DEC_CTRL7_DCT6_START_BIT(x)       (((x) & 0x3f) << 6)
-#define     VDPU_REG_DEC_CTRL7_DCT7_START_BIT(x)       (((x) & 0x3f) << 0)
-#define VDPU_REG_ADDR_STR                      0x030
-#define VDPU_REG_ADDR_DST                      0x034
-#define VDPU_REG_ADDR_REF(i)                   (0x038 + ((i) * 0x4))
-#define     VDPU_REG_ADDR_REF_FIELD_E                  BIT(1)
-#define     VDPU_REG_ADDR_REF_TOPC_E                   BIT(0)
-#define VDPU_REG_REF_PIC(i)                    (0x078 + ((i) * 0x4))
-#define     VDPU_REG_REF_PIC_FILT_TYPE_E               BIT(31)
-#define     VDPU_REG_REF_PIC_FILT_SHARPNESS(x) (((x) & 0x7) << 28)
-#define     VDPU_REG_REF_PIC_MB_ADJ_0(x)               (((x) & 0x7f) << 21)
-#define     VDPU_REG_REF_PIC_MB_ADJ_1(x)               (((x) & 0x7f) << 14)
-#define     VDPU_REG_REF_PIC_MB_ADJ_2(x)               (((x) & 0x7f) << 7)
-#define     VDPU_REG_REF_PIC_MB_ADJ_3(x)               (((x) & 0x7f) << 0)
-#define     VDPU_REG_REF_PIC_REFER1_NBR(x)             (((x) & 0xffff) << 16)
-#define     VDPU_REG_REF_PIC_REFER0_NBR(x)             (((x) & 0xffff) << 0)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_0(x)             (((x) & 0x3f) << 18)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_1(x)             (((x) & 0x3f) << 12)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_2(x)             (((x) & 0x3f) << 6)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_3(x)             (((x) & 0x3f) << 0)
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_0(x)  (((x) & 0x1f) << 27)
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_1(x)  (((x) & 0x1f) << 22)
-#define     VDPU_REG_REF_PIC_QUANT_0(x)                        (((x) & 0x7ff) << 11)
-#define     VDPU_REG_REF_PIC_QUANT_1(x)                        (((x) & 0x7ff) << 0)
-#define VDPU_REG_LT_REF                                0x098
-#define VDPU_REG_VALID_REF                     0x09c
-#define VDPU_REG_ADDR_QTABLE                   0x0a0
-#define VDPU_REG_ADDR_DIR_MV                   0x0a4
-#define VDPU_REG_BD_REF_PIC(i)                 (0x0a8 + ((i) * 0x4))
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B2(x)      (((x) & 0x1f) << 25)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F2(x)      (((x) & 0x1f) << 20)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B1(x)      (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F1(x)      (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B0(x)      (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F0(x)      (((x) & 0x1f) << 0)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_2_M1(x)       (((x) & 0x3) << 10)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_2_4(x)                (((x) & 0x3) << 8)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_4_M1(x)       (((x) & 0x3) << 6)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_4_4(x)                (((x) & 0x3) << 4)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_6_M1(x)       (((x) & 0x3) << 2)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_6_4(x)                (((x) & 0x3) << 0)
-#define     VDPU_REG_BD_REF_PIC_QUANT_DELTA_2(x)       (((x) & 0x1f) << 27)
-#define     VDPU_REG_BD_REF_PIC_QUANT_DELTA_3(x)       (((x) & 0x1f) << 22)
-#define     VDPU_REG_BD_REF_PIC_QUANT_2(x)             (((x) & 0x7ff) << 11)
-#define     VDPU_REG_BD_REF_PIC_QUANT_3(x)             (((x) & 0x7ff) << 0)
-#define VDPU_REG_BD_P_REF_PIC                  0x0bc
-#define     VDPU_REG_BD_P_REF_PIC_QUANT_DELTA_4(x)     (((x) & 0x1f) << 27)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F3(x)    (((x) & 0x1f) << 25)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F2(x)    (((x) & 0x1f) << 20)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F1(x)    (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F0(x)    (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_P_REF_PIC_BINIT_RLIST_B15(x)   (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_P_REF_PIC_BINIT_RLIST_F15(x)   (((x) & 0x1f) << 0)
-#define VDPU_REG_ERR_CONC                      0x0c0
-#define     VDPU_REG_ERR_CONC_STARTMB_X(x)             (((x) & 0x1ff) << 23)
-#define     VDPU_REG_ERR_CONC_STARTMB_Y(x)             (((x) & 0xff) << 15)
-#define VDPU_REG_PRED_FLT                      0x0c4
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_0(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_1(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_2(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_REF_BUF_CTRL                  0x0cc
-#define     VDPU_REG_REF_BUF_CTRL_REFBU_E              BIT(31)
-#define     VDPU_REG_REF_BUF_CTRL_REFBU_THR(x)         (((x) & 0xfff) << 19)
-#define     VDPU_REG_REF_BUF_CTRL_REFBU_PICID(x)       (((x) & 0x1f) << 14)
-#define     VDPU_REG_REF_BUF_CTRL_REFBU_EVAL_E         BIT(13)
-#define     VDPU_REG_REF_BUF_CTRL_REFBU_FPARMOD_E      BIT(12)
-#define     VDPU_REG_REF_BUF_CTRL_REFBU_Y_OFFSET(x)    (((x) & 0x1ff) << 0)
-#define VDPU_REG_REF_BUF_CTRL2                 0x0dc
-#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_BUF_E                BIT(31)
-#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_THR(x)       (((x) & 0xfff) << 19)
-#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_PICID(x)     (((x) & 0x1f) << 14)
-#define     VDPU_REG_REF_BUF_CTRL2_APF_THRESHOLD(x)    (((x) & 0x3fff) << 0)
-#define VDPU_REG_SOFT_RESET                    0x194
-
-#endif /* RK3288_VPU_REGS_H_ */
diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c
deleted file mode 100644 (file)
index 2b36899..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- *     Jeffy Chen <jeffy.chen@rock-chips.com>
- */
-
-#include <linux/clk.h>
-
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_jpeg.h"
-#include "rk3399_vpu_regs.h"
-
-#define RK3399_ACLK_MAX_FREQ (400 * 1000 * 1000)
-
-/*
- * Supported formats.
- */
-
-static const struct rockchip_vpu_fmt rk3399_vpu_enc_fmts[] = {
-       {
-               .fourcc = V4L2_PIX_FMT_YUV420M,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420P,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_NV12M,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_YUV420SP,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_YUYV,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_YUYV422,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_UYVY,
-               .codec_mode = RK_VPU_MODE_NONE,
-               .enc_fmt = RK3288_VPU_ENC_FMT_UYVY422,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_JPEG,
-               .codec_mode = RK_VPU_MODE_JPEG_ENC,
-               .max_depth = 2,
-               .header_size = JPEG_HEADER_SIZE,
-               .frmsize = {
-                       .min_width = 96,
-                       .max_width = 8192,
-                       .step_width = JPEG_MB_DIM,
-                       .min_height = 32,
-                       .max_height = 8192,
-                       .step_height = JPEG_MB_DIM,
-               },
-       },
-};
-
-static const struct rockchip_vpu_fmt rk3399_vpu_dec_fmts[] = {
-       {
-               .fourcc = V4L2_PIX_FMT_NV12,
-               .codec_mode = RK_VPU_MODE_NONE,
-       },
-       {
-               .fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
-               .codec_mode = RK_VPU_MODE_MPEG2_DEC,
-               .max_depth = 2,
-               .frmsize = {
-                       .min_width = 48,
-                       .max_width = 1920,
-                       .step_width = MPEG2_MB_DIM,
-                       .min_height = 48,
-                       .max_height = 1088,
-                       .step_height = MPEG2_MB_DIM,
-               },
-       },
-};
-
-static irqreturn_t rk3399_vepu_irq(int irq, void *dev_id)
-{
-       struct rockchip_vpu_dev *vpu = dev_id;
-       enum vb2_buffer_state state;
-       u32 status, bytesused;
-
-       status = vepu_read(vpu, VEPU_REG_INTERRUPT);
-       bytesused = vepu_read(vpu, VEPU_REG_STR_BUF_LIMIT) / 8;
-       state = (status & VEPU_REG_INTERRUPT_FRAME_READY) ?
-               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
-
-       vepu_write(vpu, 0, VEPU_REG_INTERRUPT);
-       vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);
-
-       rockchip_vpu_irq_done(vpu, bytesused, state);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t rk3399_vdpu_irq(int irq, void *dev_id)
-{
-       struct rockchip_vpu_dev *vpu = dev_id;
-       enum vb2_buffer_state state;
-       u32 status;
-
-       status = vdpu_read(vpu, VDPU_REG_INTERRUPT);
-       state = (status & VDPU_REG_INTERRUPT_DEC_IRQ) ?
-               VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
-
-       vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);
-       vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL);
-
-       rockchip_vpu_irq_done(vpu, 0, state);
-
-       return IRQ_HANDLED;
-}
-
-static int rk3399_vpu_hw_init(struct rockchip_vpu_dev *vpu)
-{
-       /* Bump ACLK to max. possible freq. to improve performance. */
-       clk_set_rate(vpu->clocks[0].clk, RK3399_ACLK_MAX_FREQ);
-       return 0;
-}
-
-static void rk3399_vpu_enc_reset(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-
-       vepu_write(vpu, VEPU_REG_INTERRUPT_DIS_BIT, VEPU_REG_INTERRUPT);
-       vepu_write(vpu, 0, VEPU_REG_ENCODE_START);
-       vepu_write(vpu, 0, VEPU_REG_AXI_CTRL);
-}
-
-static void rk3399_vpu_dec_reset(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-
-       vdpu_write(vpu, VDPU_REG_INTERRUPT_DEC_IRQ_DIS, VDPU_REG_INTERRUPT);
-       vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS);
-       vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET);
-}
-
-/*
- * Supported codec ops.
- */
-
-static const struct rockchip_vpu_codec_ops rk3399_vpu_codec_ops[] = {
-       [RK_VPU_MODE_JPEG_ENC] = {
-               .run = rk3399_vpu_jpeg_enc_run,
-               .reset = rk3399_vpu_enc_reset,
-               .init = rockchip_vpu_jpeg_enc_init,
-               .exit = rockchip_vpu_jpeg_enc_exit,
-       },
-       [RK_VPU_MODE_MPEG2_DEC] = {
-               .run = rk3399_vpu_mpeg2_dec_run,
-               .reset = rk3399_vpu_dec_reset,
-               .init = rockchip_vpu_mpeg2_dec_init,
-               .exit = rockchip_vpu_mpeg2_dec_exit,
-       },
-};
-
-/*
- * VPU variant.
- */
-
-const struct rockchip_vpu_variant rk3399_vpu_variant = {
-       .enc_offset = 0x0,
-       .enc_fmts = rk3399_vpu_enc_fmts,
-       .num_enc_fmts = ARRAY_SIZE(rk3399_vpu_enc_fmts),
-       .dec_offset = 0x400,
-       .dec_fmts = rk3399_vpu_dec_fmts,
-       .num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts),
-       .codec = RK_VPU_JPEG_ENCODER | RK_VPU_MPEG2_DECODER,
-       .codec_ops = rk3399_vpu_codec_ops,
-       .vepu_irq = rk3399_vepu_irq,
-       .vdpu_irq = rk3399_vdpu_irq,
-       .init = rk3399_vpu_hw_init,
-       .clk_names = {"aclk", "hclk"},
-       .num_clocks = 2
-};
diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c
deleted file mode 100644 (file)
index 460edc5..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- *
- * JPEG encoder
- * ------------
- * The VPU JPEG encoder produces JPEG baseline sequential format.
- * The quantization coefficients are 8-bit values, complying with
- * the baseline specification. Therefore, it requires
- * luma and chroma quantization tables. The hardware does entropy
- * encoding using internal Huffman tables, as specified in the JPEG
- * specification.
- *
- * In other words, only the luma and chroma quantization tables are
- * required for the encoding operation.
- *
- * Quantization luma table values are written to registers
- * VEPU_swreg_0-VEPU_swreg_15, and chroma table values to
- * VEPU_swreg_16-VEPU_swreg_31.
- *
- * JPEG zigzag order is expected on the quantization tables.
- */
-
-#include <asm/unaligned.h>
-#include <media/v4l2-mem2mem.h>
-#include "rockchip_vpu_jpeg.h"
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_v4l2.h"
-#include "rockchip_vpu_hw.h"
-#include "rk3399_vpu_regs.h"
-
-#define VEPU_JPEG_QUANT_TABLE_COUNT 16
-
-static void rk3399_vpu_set_src_img_ctrl(struct rockchip_vpu_dev *vpu,
-                                       struct rockchip_vpu_ctx *ctx)
-{
-       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
-       u32 reg;
-
-       /*
-        * The pix fmt width/height are already macroblock aligned
-        * by .vidioc_s_fmt_vid_cap_mplane() callback
-        */
-       reg = VEPU_REG_IN_IMG_CTRL_ROW_LEN(pix_fmt->width);
-       vepu_write_relaxed(vpu, reg, VEPU_REG_INPUT_LUMA_INFO);
-
-       reg = VEPU_REG_IN_IMG_CTRL_OVRFLR_D4(0) |
-             VEPU_REG_IN_IMG_CTRL_OVRFLB(0);
-       /*
-        * This register controls the input crop, as the offset
-        * from the right/bottom within the last macroblock. The offset from the
-        * right must be divided by 4 and so the crop must be aligned to 4 pixels
-        * horizontally.
-        */
-       vepu_write_relaxed(vpu, reg, VEPU_REG_ENC_OVER_FILL_STRM_OFFSET);
-
-       reg = VEPU_REG_IN_IMG_CTRL_FMT(ctx->vpu_src_fmt->enc_fmt);
-       vepu_write_relaxed(vpu, reg, VEPU_REG_ENC_CTRL1);
-}
-
-static void rk3399_vpu_jpeg_enc_set_buffers(struct rockchip_vpu_dev *vpu,
-                                           struct rockchip_vpu_ctx *ctx,
-                                           struct vb2_buffer *src_buf)
-{
-       struct v4l2_pix_format_mplane *pix_fmt = &ctx->src_fmt;
-       dma_addr_t src[3];
-
-       WARN_ON(pix_fmt->num_planes > 3);
-
-       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.dma,
-                          VEPU_REG_ADDR_OUTPUT_STREAM);
-       vepu_write_relaxed(vpu, ctx->jpeg_enc.bounce_buffer.size,
-                          VEPU_REG_STR_BUF_LIMIT);
-
-       if (pix_fmt->num_planes == 1) {
-               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
-       } else if (pix_fmt->num_planes == 2) {
-               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
-               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
-               vepu_write_relaxed(vpu, src[1], VEPU_REG_ADDR_IN_PLANE_1);
-       } else {
-               src[0] = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-               src[1] = vb2_dma_contig_plane_dma_addr(src_buf, 1);
-               src[2] = vb2_dma_contig_plane_dma_addr(src_buf, 2);
-               vepu_write_relaxed(vpu, src[0], VEPU_REG_ADDR_IN_PLANE_0);
-               vepu_write_relaxed(vpu, src[1], VEPU_REG_ADDR_IN_PLANE_1);
-               vepu_write_relaxed(vpu, src[2], VEPU_REG_ADDR_IN_PLANE_2);
-       }
-}
-
-static void
-rk3399_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,
-                              unsigned char *luma_qtable,
-                              unsigned char *chroma_qtable)
-{
-       u32 reg, i;
-
-       for (i = 0; i < VEPU_JPEG_QUANT_TABLE_COUNT; i++) {
-               reg = get_unaligned_be32(&luma_qtable[i]);
-               vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_LUMA_QUAT(i));
-
-               reg = get_unaligned_be32(&chroma_qtable[i]);
-               vepu_write_relaxed(vpu, reg, VEPU_REG_JPEG_CHROMA_QUAT(i));
-       }
-}
-
-void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *src_buf, *dst_buf;
-       struct rockchip_vpu_jpeg_ctx jpeg_ctx;
-       struct media_request *src_req;
-       u32 reg;
-
-       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-
-       src_req = src_buf->vb2_buf.req_obj.req;
-       v4l2_ctrl_request_setup(src_req, &ctx->ctrl_handler);
-
-       memset(&jpeg_ctx, 0, sizeof(jpeg_ctx));
-       jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
-       jpeg_ctx.width = ctx->dst_fmt.width;
-       jpeg_ctx.height = ctx->dst_fmt.height;
-       jpeg_ctx.quality = ctx->jpeg_quality;
-       rockchip_vpu_jpeg_header_assemble(&jpeg_ctx);
-
-       /* Switch to JPEG encoder mode before writing registers */
-       vepu_write_relaxed(vpu, VEPU_REG_ENCODE_FORMAT_JPEG,
-                          VEPU_REG_ENCODE_START);
-
-       rk3399_vpu_set_src_img_ctrl(vpu, ctx);
-       rk3399_vpu_jpeg_enc_set_buffers(vpu, ctx, &src_buf->vb2_buf);
-       rk3399_vpu_jpeg_enc_set_qtable(vpu,
-                                      rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 0),
-                                      rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 1));
-
-       reg = VEPU_REG_OUTPUT_SWAP32
-               | VEPU_REG_OUTPUT_SWAP16
-               | VEPU_REG_OUTPUT_SWAP8
-               | VEPU_REG_INPUT_SWAP8
-               | VEPU_REG_INPUT_SWAP16
-               | VEPU_REG_INPUT_SWAP32;
-       /* Make sure that all registers are written at this point. */
-       vepu_write(vpu, reg, VEPU_REG_DATA_ENDIAN);
-
-       reg = VEPU_REG_AXI_CTRL_BURST_LEN(16);
-       vepu_write_relaxed(vpu, reg, VEPU_REG_AXI_CTRL);
-
-       reg = VEPU_REG_MB_WIDTH(JPEG_MB_WIDTH(ctx->src_fmt.width))
-               | VEPU_REG_MB_HEIGHT(JPEG_MB_HEIGHT(ctx->src_fmt.height))
-               | VEPU_REG_FRAME_TYPE_INTRA
-               | VEPU_REG_ENCODE_FORMAT_JPEG
-               | VEPU_REG_ENCODE_ENABLE;
-
-       v4l2_ctrl_request_complete(src_req, &ctx->ctrl_handler);
-
-       /* Kick the watchdog and start encoding */
-       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
-       vepu_write(vpu, reg, VEPU_REG_ENCODE_START);
-}
diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c
deleted file mode 100644 (file)
index c4c092c..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- */
-
-#include <asm/unaligned.h>
-#include <linux/bitfield.h>
-#include <media/v4l2-mem2mem.h>
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_hw.h"
-
-#define VDPU_SWREG(nr)                 ((nr) * 4)
-
-#define VDPU_REG_DEC_OUT_BASE          VDPU_SWREG(63)
-#define VDPU_REG_RLC_VLC_BASE          VDPU_SWREG(64)
-#define VDPU_REG_QTABLE_BASE           VDPU_SWREG(61)
-#define VDPU_REG_REFER0_BASE           VDPU_SWREG(131)
-#define VDPU_REG_REFER2_BASE           VDPU_SWREG(134)
-#define VDPU_REG_REFER3_BASE           VDPU_SWREG(135)
-#define VDPU_REG_REFER1_BASE           VDPU_SWREG(148)
-#define VDPU_REG_DEC_E(v)              ((v) ? BIT(0) : 0)
-
-#define VDPU_REG_DEC_ADV_PRE_DIS(v)    ((v) ? BIT(11) : 0)
-#define VDPU_REG_DEC_SCMD_DIS(v)       ((v) ? BIT(10) : 0)
-#define VDPU_REG_FILTERING_DIS(v)      ((v) ? BIT(8) : 0)
-#define VDPU_REG_DEC_LATENCY(v)                (((v) << 1) & GENMASK(6, 1))
-
-#define VDPU_REG_INIT_QP(v)            (((v) << 25) & GENMASK(30, 25))
-#define VDPU_REG_STREAM_LEN(v)         (((v) << 0) & GENMASK(23, 0))
-
-#define VDPU_REG_APF_THRESHOLD(v)      (((v) << 17) & GENMASK(30, 17))
-#define VDPU_REG_STARTMB_X(v)          (((v) << 8) & GENMASK(16, 8))
-#define VDPU_REG_STARTMB_Y(v)          (((v) << 0) & GENMASK(7, 0))
-
-#define VDPU_REG_DEC_MODE(v)           (((v) << 0) & GENMASK(3, 0))
-
-#define VDPU_REG_DEC_STRENDIAN_E(v)    ((v) ? BIT(5) : 0)
-#define VDPU_REG_DEC_STRSWAP32_E(v)    ((v) ? BIT(4) : 0)
-#define VDPU_REG_DEC_OUTSWAP32_E(v)    ((v) ? BIT(3) : 0)
-#define VDPU_REG_DEC_INSWAP32_E(v)     ((v) ? BIT(2) : 0)
-#define VDPU_REG_DEC_OUT_ENDIAN(v)     ((v) ? BIT(1) : 0)
-#define VDPU_REG_DEC_IN_ENDIAN(v)      ((v) ? BIT(0) : 0)
-
-#define VDPU_REG_DEC_DATA_DISC_E(v)    ((v) ? BIT(22) : 0)
-#define VDPU_REG_DEC_MAX_BURST(v)      (((v) << 16) & GENMASK(20, 16))
-#define VDPU_REG_DEC_AXI_WR_ID(v)      (((v) << 8) & GENMASK(15, 8))
-#define VDPU_REG_DEC_AXI_RD_ID(v)      (((v) << 0) & GENMASK(7, 0))
-
-#define VDPU_REG_RLC_MODE_E(v)         ((v) ? BIT(20) : 0)
-#define VDPU_REG_PIC_INTERLACE_E(v)    ((v) ? BIT(17) : 0)
-#define VDPU_REG_PIC_FIELDMODE_E(v)    ((v) ? BIT(16) : 0)
-#define VDPU_REG_PIC_B_E(v)            ((v) ? BIT(15) : 0)
-#define VDPU_REG_PIC_INTER_E(v)                ((v) ? BIT(14) : 0)
-#define VDPU_REG_PIC_TOPFIELD_E(v)     ((v) ? BIT(13) : 0)
-#define VDPU_REG_FWD_INTERLACE_E(v)    ((v) ? BIT(12) : 0)
-#define VDPU_REG_WRITE_MVS_E(v)                ((v) ? BIT(10) : 0)
-#define VDPU_REG_DEC_TIMEOUT_E(v)      ((v) ? BIT(5) : 0)
-#define VDPU_REG_DEC_CLK_GATE_E(v)     ((v) ? BIT(4) : 0)
-
-#define VDPU_REG_PIC_MB_WIDTH(v)       (((v) << 23) & GENMASK(31, 23))
-#define VDPU_REG_PIC_MB_HEIGHT_P(v)    (((v) << 11) & GENMASK(18, 11))
-#define VDPU_REG_ALT_SCAN_E(v)         ((v) ? BIT(6) : 0)
-#define VDPU_REG_TOPFIELDFIRST_E(v)    ((v) ? BIT(5) : 0)
-
-#define VDPU_REG_STRM_START_BIT(v)     (((v) << 26) & GENMASK(31, 26))
-#define VDPU_REG_QSCALE_TYPE(v)                ((v) ? BIT(24) : 0)
-#define VDPU_REG_CON_MV_E(v)           ((v) ? BIT(4) : 0)
-#define VDPU_REG_INTRA_DC_PREC(v)      (((v) << 2) & GENMASK(3, 2))
-#define VDPU_REG_INTRA_VLC_TAB(v)      ((v) ? BIT(1) : 0)
-#define VDPU_REG_FRAME_PRED_DCT(v)     ((v) ? BIT(0) : 0)
-
-#define VDPU_REG_ALT_SCAN_FLAG_E(v)    ((v) ? BIT(19) : 0)
-#define VDPU_REG_FCODE_FWD_HOR(v)      (((v) << 15) & GENMASK(18, 15))
-#define VDPU_REG_FCODE_FWD_VER(v)      (((v) << 11) & GENMASK(14, 11))
-#define VDPU_REG_FCODE_BWD_HOR(v)      (((v) << 7) & GENMASK(10, 7))
-#define VDPU_REG_FCODE_BWD_VER(v)      (((v) << 3) & GENMASK(6, 3))
-#define VDPU_REG_MV_ACCURACY_FWD(v)    ((v) ? BIT(2) : 0)
-#define VDPU_REG_MV_ACCURACY_BWD(v)    ((v) ? BIT(1) : 0)
-
-#define PICT_TOP_FIELD     1
-#define PICT_BOTTOM_FIELD  2
-#define PICT_FRAME         3
-
-static void
-rk3399_vpu_mpeg2_dec_set_quantization(struct rockchip_vpu_dev *vpu,
-                                     struct rockchip_vpu_ctx *ctx)
-{
-       struct v4l2_ctrl_mpeg2_quantization *quantization;
-
-       quantization = rockchip_vpu_get_ctrl(ctx,
-                               V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION);
-       rockchip_vpu_mpeg2_dec_copy_qtable(ctx->mpeg2_dec.qtable.cpu,
-                                          quantization);
-       vdpu_write_relaxed(vpu, ctx->mpeg2_dec.qtable.dma,
-                          VDPU_REG_QTABLE_BASE);
-}
-
-static void
-rk3399_vpu_mpeg2_dec_set_buffers(struct rockchip_vpu_dev *vpu,
-                                struct rockchip_vpu_ctx *ctx,
-                                struct vb2_buffer *src_buf,
-                                struct vb2_buffer *dst_buf,
-                                const struct v4l2_mpeg2_sequence *sequence,
-                                const struct v4l2_mpeg2_picture *picture,
-                                const struct v4l2_ctrl_mpeg2_slice_params *slice_params)
-{
-       dma_addr_t forward_addr = 0, backward_addr = 0;
-       dma_addr_t current_addr, addr;
-       struct vb2_queue *vq;
-
-       vq = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);
-
-       switch (picture->picture_coding_type) {
-       case V4L2_MPEG2_PICTURE_CODING_TYPE_B:
-               backward_addr = rockchip_vpu_get_ref(vq,
-                                               slice_params->backward_ref_ts);
-               /* fall-through */
-       case V4L2_MPEG2_PICTURE_CODING_TYPE_P:
-               forward_addr = rockchip_vpu_get_ref(vq,
-                                               slice_params->forward_ref_ts);
-       }
-
-       /* Source bitstream buffer */
-       addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-       vdpu_write_relaxed(vpu, addr, VDPU_REG_RLC_VLC_BASE);
-
-       /* Destination frame buffer */
-       addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
-       current_addr = addr;
-
-       if (picture->picture_structure == PICT_BOTTOM_FIELD)
-               addr += ALIGN(ctx->dst_fmt.width, 16);
-       vdpu_write_relaxed(vpu, addr, VDPU_REG_DEC_OUT_BASE);
-
-       if (!forward_addr)
-               forward_addr = current_addr;
-       if (!backward_addr)
-               backward_addr = current_addr;
-
-       /* Set forward ref frame (top/bottom field) */
-       if (picture->picture_structure == PICT_FRAME ||
-           picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B ||
-           (picture->picture_structure == PICT_TOP_FIELD &&
-            picture->top_field_first) ||
-           (picture->picture_structure == PICT_BOTTOM_FIELD &&
-            !picture->top_field_first)) {
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER0_BASE);
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER1_BASE);
-       } else if (picture->picture_structure == PICT_TOP_FIELD) {
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER0_BASE);
-               vdpu_write_relaxed(vpu, current_addr, VDPU_REG_REFER1_BASE);
-       } else if (picture->picture_structure == PICT_BOTTOM_FIELD) {
-               vdpu_write_relaxed(vpu, current_addr, VDPU_REG_REFER0_BASE);
-               vdpu_write_relaxed(vpu, forward_addr, VDPU_REG_REFER1_BASE);
-       }
-
-       /* Set backward ref frame (top/bottom field) */
-       vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER2_BASE);
-       vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER3_BASE);
-}
-
-void rk3399_vpu_mpeg2_dec_run(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *src_buf, *dst_buf;
-       const struct v4l2_ctrl_mpeg2_slice_params *slice_params;
-       const struct v4l2_mpeg2_sequence *sequence;
-       const struct v4l2_mpeg2_picture *picture;
-       u32 reg;
-
-       src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-       dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-
-       /* Apply request controls if any */
-       v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
-                               &ctx->ctrl_handler);
-
-       slice_params = rockchip_vpu_get_ctrl(ctx,
-                               V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS);
-       sequence = &slice_params->sequence;
-       picture = &slice_params->picture;
-
-       reg = VDPU_REG_DEC_ADV_PRE_DIS(0) |
-             VDPU_REG_DEC_SCMD_DIS(0) |
-             VDPU_REG_FILTERING_DIS(1) |
-             VDPU_REG_DEC_LATENCY(0);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(50));
-
-       reg = VDPU_REG_INIT_QP(1) |
-             VDPU_REG_STREAM_LEN(slice_params->bit_size >> 3);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(51));
-
-       reg = VDPU_REG_APF_THRESHOLD(8) |
-             VDPU_REG_STARTMB_X(0) |
-             VDPU_REG_STARTMB_Y(0);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(52));
-
-       reg = VDPU_REG_DEC_MODE(5);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(53));
-
-       reg = VDPU_REG_DEC_STRENDIAN_E(1) |
-             VDPU_REG_DEC_STRSWAP32_E(1) |
-             VDPU_REG_DEC_OUTSWAP32_E(1) |
-             VDPU_REG_DEC_INSWAP32_E(1) |
-             VDPU_REG_DEC_OUT_ENDIAN(1) |
-             VDPU_REG_DEC_IN_ENDIAN(1);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(54));
-
-       reg = VDPU_REG_DEC_DATA_DISC_E(0) |
-             VDPU_REG_DEC_MAX_BURST(16) |
-             VDPU_REG_DEC_AXI_WR_ID(0) |
-             VDPU_REG_DEC_AXI_RD_ID(0);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(56));
-
-       reg = VDPU_REG_RLC_MODE_E(0) |
-             VDPU_REG_PIC_INTERLACE_E(!sequence->progressive_sequence) |
-             VDPU_REG_PIC_FIELDMODE_E(picture->picture_structure != PICT_FRAME) |
-             VDPU_REG_PIC_B_E(picture->picture_coding_type == V4L2_MPEG2_PICTURE_CODING_TYPE_B) |
-             VDPU_REG_PIC_INTER_E(picture->picture_coding_type != V4L2_MPEG2_PICTURE_CODING_TYPE_I) |
-             VDPU_REG_PIC_TOPFIELD_E(picture->picture_structure == PICT_TOP_FIELD) |
-             VDPU_REG_FWD_INTERLACE_E(0) |
-             VDPU_REG_WRITE_MVS_E(0) |
-             VDPU_REG_DEC_TIMEOUT_E(1) |
-             VDPU_REG_DEC_CLK_GATE_E(1);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(57));
-
-       reg = VDPU_REG_PIC_MB_WIDTH(MPEG2_MB_WIDTH(ctx->dst_fmt.width)) |
-             VDPU_REG_PIC_MB_HEIGHT_P(MPEG2_MB_HEIGHT(ctx->dst_fmt.height)) |
-             VDPU_REG_ALT_SCAN_E(picture->alternate_scan) |
-             VDPU_REG_TOPFIELDFIRST_E(picture->top_field_first);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(120));
-
-       reg = VDPU_REG_STRM_START_BIT(slice_params->data_bit_offset) |
-             VDPU_REG_QSCALE_TYPE(picture->q_scale_type) |
-             VDPU_REG_CON_MV_E(picture->concealment_motion_vectors) |
-             VDPU_REG_INTRA_DC_PREC(picture->intra_dc_precision) |
-             VDPU_REG_INTRA_VLC_TAB(picture->intra_vlc_format) |
-             VDPU_REG_FRAME_PRED_DCT(picture->frame_pred_frame_dct);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(122));
-
-       reg = VDPU_REG_ALT_SCAN_FLAG_E(picture->alternate_scan) |
-             VDPU_REG_FCODE_FWD_HOR(picture->f_code[0][0]) |
-             VDPU_REG_FCODE_FWD_VER(picture->f_code[0][1]) |
-             VDPU_REG_FCODE_BWD_HOR(picture->f_code[1][0]) |
-             VDPU_REG_FCODE_BWD_VER(picture->f_code[1][1]) |
-             VDPU_REG_MV_ACCURACY_FWD(1) |
-             VDPU_REG_MV_ACCURACY_BWD(1);
-       vdpu_write_relaxed(vpu, reg, VDPU_SWREG(136));
-
-       rk3399_vpu_mpeg2_dec_set_quantization(vpu, ctx);
-
-       rk3399_vpu_mpeg2_dec_set_buffers(vpu, ctx, &src_buf->vb2_buf,
-                                        &dst_buf->vb2_buf,
-                                        sequence, picture, slice_params);
-
-       /* Controls no longer in-use, we can complete them */
-       v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req,
-                                  &ctx->ctrl_handler);
-
-       /* Kick the watchdog and start decoding */
-       schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
-
-       reg = vdpu_read(vpu, VDPU_SWREG(57)) | VDPU_REG_DEC_E(1);
-       vdpu_write(vpu, reg, VDPU_SWREG(57));
-}
diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_regs.h b/drivers/staging/media/rockchip/vpu/rk3399_vpu_regs.h
deleted file mode 100644 (file)
index fbe2941..0000000
+++ /dev/null
@@ -1,600 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- *     Alpha Lin <alpha.lin@rock-chips.com>
- */
-
-#ifndef RK3399_VPU_REGS_H_
-#define RK3399_VPU_REGS_H_
-
-/* Encoder registers. */
-#define VEPU_REG_VP8_QUT_1ST(i)                        (0x000 + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_DC_Y2(x)                  (((x) & 0x3fff) << 16)
-#define     VEPU_REG_VP8_QUT_DC_Y1(x)                  (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_QUT_2ND(i)                        (0x004 + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_AC_Y1(x)                  (((x) & 0x3fff) << 16)
-#define     VEPU_REG_VP8_QUT_DC_CHR(x)                 (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_QUT_3RD(i)                        (0x008 + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_AC_CHR(x)                 (((x) & 0x3fff) << 16)
-#define     VEPU_REG_VP8_QUT_AC_Y2(x)                  (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_QUT_4TH(i)                        (0x00c + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_ZB_DC_CHR(x)              (((x) & 0x1ff) << 18)
-#define     VEPU_REG_VP8_QUT_ZB_DC_Y2(x)               (((x) & 0x1ff) << 9)
-#define     VEPU_REG_VP8_QUT_ZB_DC_Y1(x)               (((x) & 0x1ff) << 0)
-#define VEPU_REG_VP8_QUT_5TH(i)                        (0x010 + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_ZB_AC_CHR(x)              (((x) & 0x1ff) << 18)
-#define     VEPU_REG_VP8_QUT_ZB_AC_Y2(x)               (((x) & 0x1ff) << 9)
-#define     VEPU_REG_VP8_QUT_ZB_AC_Y1(x)               (((x) & 0x1ff) << 0)
-#define VEPU_REG_VP8_QUT_6TH(i)                        (0x014 + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_RND_DC_CHR(x)             (((x) & 0xff) << 16)
-#define     VEPU_REG_VP8_QUT_RND_DC_Y2(x)              (((x) & 0xff) << 8)
-#define     VEPU_REG_VP8_QUT_RND_DC_Y1(x)              (((x) & 0xff) << 0)
-#define VEPU_REG_VP8_QUT_7TH(i)                        (0x018 + ((i) * 0x24))
-#define     VEPU_REG_VP8_QUT_RND_AC_CHR(x)             (((x) & 0xff) << 16)
-#define     VEPU_REG_VP8_QUT_RND_AC_Y2(x)              (((x) & 0xff) << 8)
-#define     VEPU_REG_VP8_QUT_RND_AC_Y1(x)              (((x) & 0xff) << 0)
-#define VEPU_REG_VP8_QUT_8TH(i)                        (0x01c + ((i) * 0x24))
-#define     VEPU_REG_VP8_SEG_FILTER_LEVEL(x)           (((x) & 0x3f) << 25)
-#define     VEPU_REG_VP8_DEQUT_DC_CHR(x)               (((x) & 0xff) << 17)
-#define     VEPU_REG_VP8_DEQUT_DC_Y2(x)                        (((x) & 0x1ff) << 8)
-#define     VEPU_REG_VP8_DEQUT_DC_Y1(x)                        (((x) & 0xff) << 0)
-#define VEPU_REG_VP8_QUT_9TH(i)                        (0x020 + ((i) * 0x24))
-#define     VEPU_REG_VP8_DEQUT_AC_CHR(x)               (((x) & 0x1ff) << 18)
-#define     VEPU_REG_VP8_DEQUT_AC_Y2(x)                        (((x) & 0x1ff) << 9)
-#define     VEPU_REG_VP8_DEQUT_AC_Y1(x)                        (((x) & 0x1ff) << 0)
-#define VEPU_REG_ADDR_VP8_SEG_MAP              0x06c
-#define VEPU_REG_VP8_INTRA_4X4_PENALTY(i)      (0x070 + ((i) * 0x4))
-#define     VEPU_REG_VP8_INTRA_4X4_PENALTY_0(x)                (((x) & 0xfff) << 0)
-#define     VEPU_REG_VP8_INTRA_4x4_PENALTY_1(x)                (((x) & 0xfff) << 16)
-#define VEPU_REG_VP8_INTRA_16X16_PENALTY(i)    (0x084 + ((i) * 0x4))
-#define     VEPU_REG_VP8_INTRA_16X16_PENALTY_0(x)      (((x) & 0xfff) << 0)
-#define     VEPU_REG_VP8_INTRA_16X16_PENALTY_1(x)      (((x) & 0xfff) << 16)
-#define VEPU_REG_VP8_CONTROL                   0x0a0
-#define     VEPU_REG_VP8_LF_MODE_DELTA_BPRED(x)                (((x) & 0x1f) << 24)
-#define     VEPU_REG_VP8_LF_REF_DELTA_INTRA_MB(x)      (((x) & 0x7f) << 16)
-#define     VEPU_REG_VP8_INTER_TYPE_BIT_COST(x)                (((x) & 0xfff) << 0)
-#define VEPU_REG_VP8_REF_FRAME_VAL             0x0a4
-#define     VEPU_REG_VP8_COEF_DMV_PENALTY(x)           (((x) & 0xfff) << 16)
-#define     VEPU_REG_VP8_REF_FRAME(x)                  (((x) & 0xfff) << 0)
-#define VEPU_REG_VP8_LOOP_FILTER_REF_DELTA     0x0a8
-#define     VEPU_REG_VP8_LF_REF_DELTA_ALT_REF(x)       (((x) & 0x7f) << 16)
-#define     VEPU_REG_VP8_LF_REF_DELTA_LAST_REF(x)      (((x) & 0x7f) << 8)
-#define     VEPU_REG_VP8_LF_REF_DELTA_GOLDEN(x)                (((x) & 0x7f) << 0)
-#define VEPU_REG_VP8_LOOP_FILTER_MODE_DELTA    0x0ac
-#define     VEPU_REG_VP8_LF_MODE_DELTA_SPLITMV(x)      (((x) & 0x7f) << 16)
-#define     VEPU_REG_VP8_LF_MODE_DELTA_ZEROMV(x)       (((x) & 0x7f) << 8)
-#define     VEPU_REG_VP8_LF_MODE_DELTA_NEWMV(x)                (((x) & 0x7f) << 0)
-#define        VEPU_REG_JPEG_LUMA_QUAT(i)              (0x000 + ((i) * 0x4))
-#define        VEPU_REG_JPEG_CHROMA_QUAT(i)            (0x040 + ((i) * 0x4))
-#define VEPU_REG_INTRA_SLICE_BITMAP(i)         (0x0b0 + ((i) * 0x4))
-#define VEPU_REG_ADDR_VP8_DCT_PART(i)          (0x0b0 + ((i) * 0x4))
-#define VEPU_REG_INTRA_AREA_CTRL               0x0b8
-#define     VEPU_REG_INTRA_AREA_TOP(x)                 (((x) & 0xff) << 24)
-#define     VEPU_REG_INTRA_AREA_BOTTOM(x)              (((x) & 0xff) << 16)
-#define     VEPU_REG_INTRA_AREA_LEFT(x)                        (((x) & 0xff) << 8)
-#define     VEPU_REG_INTRA_AREA_RIGHT(x)               (((x) & 0xff) << 0)
-#define VEPU_REG_CIR_INTRA_CTRL                        0x0bc
-#define     VEPU_REG_CIR_INTRA_FIRST_MB(x)             (((x) & 0xffff) << 16)
-#define     VEPU_REG_CIR_INTRA_INTERVAL(x)             (((x) & 0xffff) << 0)
-#define VEPU_REG_ADDR_IN_PLANE_0               0x0c0
-#define VEPU_REG_ADDR_IN_PLANE_1               0x0c4
-#define VEPU_REG_ADDR_IN_PLANE_2               0x0c8
-#define VEPU_REG_STR_HDR_REM_MSB               0x0cc
-#define VEPU_REG_STR_HDR_REM_LSB               0x0d0
-#define VEPU_REG_STR_BUF_LIMIT                 0x0d4
-#define VEPU_REG_AXI_CTRL                      0x0d8
-#define     VEPU_REG_AXI_CTRL_READ_ID(x)               (((x) & 0xff) << 24)
-#define     VEPU_REG_AXI_CTRL_WRITE_ID(x)              (((x) & 0xff) << 16)
-#define     VEPU_REG_AXI_CTRL_BURST_LEN(x)             (((x) & 0x3f) << 8)
-#define     VEPU_REG_AXI_CTRL_INCREMENT_MODE(x)                (((x) & 0x01) << 2)
-#define     VEPU_REG_AXI_CTRL_BIRST_DISCARD(x)         (((x) & 0x01) << 1)
-#define     VEPU_REG_AXI_CTRL_BIRST_DISABLE            BIT(0)
-#define VEPU_QP_ADJUST_MAD_DELTA_ROI           0x0dc
-#define     VEPU_REG_ROI_QP_DELTA_1                    (((x) & 0xf) << 12)
-#define     VEPU_REG_ROI_QP_DELTA_2                    (((x) & 0xf) << 8)
-#define     VEPU_REG_MAD_QP_ADJUSTMENT                 (((x) & 0xf) << 0)
-#define VEPU_REG_ADDR_REF_LUMA                 0x0e0
-#define VEPU_REG_ADDR_REF_CHROMA               0x0e4
-#define VEPU_REG_QP_SUM_DIV2                   0x0e8
-#define     VEPU_REG_QP_SUM(x)                         (((x) & 0x001fffff) * 2)
-#define VEPU_REG_ENC_CTRL0                     0x0ec
-#define     VEPU_REG_DISABLE_QUARTER_PIXEL_MV          BIT(28)
-#define     VEPU_REG_DEBLOCKING_FILTER_MODE(x)         (((x) & 0x3) << 24)
-#define     VEPU_REG_CABAC_INIT_IDC(x)                 (((x) & 0x3) << 21)
-#define     VEPU_REG_ENTROPY_CODING_MODE               BIT(20)
-#define     VEPU_REG_H264_TRANS8X8_MODE                        BIT(17)
-#define     VEPU_REG_H264_INTER4X4_MODE                        BIT(16)
-#define     VEPU_REG_H264_STREAM_MODE                  BIT(15)
-#define     VEPU_REG_H264_SLICE_SIZE(x)                        (((x) & 0x7f) << 8)
-#define VEPU_REG_ENC_OVER_FILL_STRM_OFFSET     0x0f0
-#define     VEPU_REG_STREAM_START_OFFSET(x)            (((x) & 0x3f) << 16)
-#define     VEPU_REG_SKIP_MACROBLOCK_PENALTY(x)                (((x) & 0xff) << 8)
-#define     VEPU_REG_IN_IMG_CTRL_OVRFLR_D4(x)          (((x) & 0x3) << 4)
-#define     VEPU_REG_IN_IMG_CTRL_OVRFLB(x)             (((x) & 0xf) << 0)
-#define VEPU_REG_INPUT_LUMA_INFO               0x0f4
-#define     VEPU_REG_IN_IMG_CHROMA_OFFSET(x)           (((x) & 0x7) << 20)
-#define     VEPU_REG_IN_IMG_LUMA_OFFSET(x)             (((x) & 0x7) << 16)
-#define     VEPU_REG_IN_IMG_CTRL_ROW_LEN(x)            (((x) & 0x3fff) << 0)
-#define VEPU_REG_RLC_SUM                       0x0f8
-#define     VEPU_REG_RLC_SUM_OUT(x)                    (((x) & 0x007fffff) * 4)
-#define VEPU_REG_SPLIT_PENALTY_4X4             0x0f8
-#define            VEPU_REG_VP8_SPLIT_PENALTY_4X4              (((x) & 0x1ff) << 19)
-#define VEPU_REG_ADDR_REC_LUMA                 0x0fc
-#define VEPU_REG_ADDR_REC_CHROMA               0x100
-#define VEPU_REG_CHECKPOINT(i)                 (0x104 + ((i) * 0x4))
-#define     VEPU_REG_CHECKPOINT_CHECK0(x)              (((x) & 0xffff))
-#define     VEPU_REG_CHECKPOINT_CHECK1(x)              (((x) & 0xffff) << 16)
-#define     VEPU_REG_CHECKPOINT_RESULT(x) \
-               ((((x) >> (16 - 16 * ((i) & 1))) & 0xffff) * 32)
-#define VEPU_REG_VP8_SEG0_QUANT_AC_Y1          0x104
-#define     VEPU_REG_VP8_SEG0_RND_AC_Y1(x)             (((x) & 0xff) << 23)
-#define     VEPU_REG_VP8_SEG0_ZBIN_AC_Y1(x)            (((x) & 0x1ff) << 14)
-#define     VEPU_REG_VP8_SEG0_QUT_AC_Y1(x)             (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_SEG0_QUANT_DC_Y2          0x108
-#define     VEPU_REG_VP8_SEG0_RND_DC_Y2(x)             (((x) & 0xff) << 23)
-#define     VEPU_REG_VP8_SEG0_ZBIN_DC_Y2(x)            (((x) & 0x1ff) << 14)
-#define     VEPU_REG_VP8_SEG0_QUT_DC_Y2(x)             (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_SEG0_QUANT_AC_Y2          0x10c
-#define     VEPU_REG_VP8_SEG0_RND_AC_Y2(x)             (((x) & 0xff) << 23)
-#define     VEPU_REG_VP8_SEG0_ZBIN_AC_Y2(x)            (((x) & 0x1ff) << 14)
-#define     VEPU_REG_VP8_SEG0_QUT_AC_Y2(x)             (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_SEG0_QUANT_DC_CHR         0x110
-#define     VEPU_REG_VP8_SEG0_RND_DC_CHR(x)            (((x) & 0xff) << 23)
-#define     VEPU_REG_VP8_SEG0_ZBIN_DC_CHR(x)           (((x) & 0x1ff) << 14)
-#define     VEPU_REG_VP8_SEG0_QUT_DC_CHR(x)            (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_SEG0_QUANT_AC_CHR         0x114
-#define     VEPU_REG_VP8_SEG0_RND_AC_CHR(x)            (((x) & 0xff) << 23)
-#define     VEPU_REG_VP8_SEG0_ZBIN_AC_CHR(x)           (((x) & 0x1ff) << 14)
-#define     VEPU_REG_VP8_SEG0_QUT_AC_CHR(x)            (((x) & 0x3fff) << 0)
-#define VEPU_REG_VP8_SEG0_QUANT_DQUT           0x118
-#define     VEPU_REG_VP8_MV_REF_IDX1(x)                        (((x) & 0x03) << 26)
-#define     VEPU_REG_VP8_SEG0_DQUT_DC_Y2(x)            (((x) & 0x1ff) << 17)
-#define     VEPU_REG_VP8_SEG0_DQUT_AC_Y1(x)            (((x) & 0x1ff) << 8)
-#define     VEPU_REG_VP8_SEG0_DQUT_DC_Y1(x)            (((x) & 0xff) << 0)
-#define VEPU_REG_CHKPT_WORD_ERR(i)             (0x118 + ((i) * 0x4))
-#define     VEPU_REG_CHKPT_WORD_ERR_CHK0(x)            (((x) & 0xffff))
-#define     VEPU_REG_CHKPT_WORD_ERR_CHK1(x)            (((x) & 0xffff) << 16)
-#define VEPU_REG_VP8_SEG0_QUANT_DQUT_1         0x11c
-#define     VEPU_REG_VP8_SEGMENT_MAP_UPDATE            BIT(30)
-#define     VEPU_REG_VP8_SEGMENT_EN                    BIT(29)
-#define     VEPU_REG_VP8_MV_REF_IDX2_EN                        BIT(28)
-#define     VEPU_REG_VP8_MV_REF_IDX2(x)                        (((x) & 0x03) << 26)
-#define     VEPU_REG_VP8_SEG0_DQUT_AC_CHR(x)           (((x) & 0x1ff) << 17)
-#define     VEPU_REG_VP8_SEG0_DQUT_DC_CHR(x)           (((x) & 0xff) << 9)
-#define     VEPU_REG_VP8_SEG0_DQUT_AC_Y2(x)            (((x) & 0x1ff) << 0)
-#define VEPU_REG_VP8_BOOL_ENC_VALUE            0x120
-#define VEPU_REG_CHKPT_DELTA_QP                        0x124
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK0(x)            (((x) & 0x0f) << 0)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK1(x)            (((x) & 0x0f) << 4)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK2(x)            (((x) & 0x0f) << 8)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK3(x)            (((x) & 0x0f) << 12)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK4(x)            (((x) & 0x0f) << 16)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK5(x)            (((x) & 0x0f) << 20)
-#define     VEPU_REG_CHKPT_DELTA_QP_CHK6(x)            (((x) & 0x0f) << 24)
-#define VEPU_REG_VP8_ENC_CTRL2                 0x124
-#define     VEPU_REG_VP8_ZERO_MV_PENALTY_FOR_REF2(x)   (((x) & 0xff) << 24)
-#define     VEPU_REG_VP8_FILTER_SHARPNESS(x)           (((x) & 0x07) << 21)
-#define     VEPU_REG_VP8_FILTER_LEVEL(x)               (((x) & 0x3f) << 15)
-#define     VEPU_REG_VP8_DCT_PARTITION_CNT(x)          (((x) & 0x03) << 13)
-#define     VEPU_REG_VP8_BOOL_ENC_VALUE_BITS(x)                (((x) & 0x1f) << 8)
-#define     VEPU_REG_VP8_BOOL_ENC_RANGE(x)             (((x) & 0xff) << 0)
-#define VEPU_REG_ENC_CTRL1                     0x128
-#define     VEPU_REG_MAD_THRESHOLD(x)                  (((x) & 0x3f) << 24)
-#define     VEPU_REG_COMPLETED_SLICES(x)               (((x) & 0xff) << 16)
-#define     VEPU_REG_IN_IMG_CTRL_FMT(x)                        (((x) & 0xf) << 4)
-#define     VEPU_REG_IN_IMG_ROTATE_MODE(x)             (((x) & 0x3) << 2)
-#define     VEPU_REG_SIZE_TABLE_PRESENT                        BIT(0)
-#define VEPU_REG_INTRA_INTER_MODE              0x12c
-#define     VEPU_REG_INTRA16X16_MODE(x)                        (((x) & 0xffff) << 16)
-#define     VEPU_REG_INTER_MODE(x)                     (((x) & 0xffff) << 0)
-#define VEPU_REG_ENC_CTRL2                     0x130
-#define     VEPU_REG_PPS_INIT_QP(x)                    (((x) & 0x3f) << 26)
-#define     VEPU_REG_SLICE_FILTER_ALPHA(x)             (((x) & 0xf) << 22)
-#define     VEPU_REG_SLICE_FILTER_BETA(x)              (((x) & 0xf) << 18)
-#define     VEPU_REG_CHROMA_QP_OFFSET(x)               (((x) & 0x1f) << 13)
-#define     VEPU_REG_FILTER_DISABLE                    BIT(5)
-#define     VEPU_REG_IDR_PIC_ID(x)                     (((x) & 0xf) << 1)
-#define     VEPU_REG_CONSTRAINED_INTRA_PREDICTION      BIT(0)
-#define VEPU_REG_ADDR_OUTPUT_STREAM            0x134
-#define VEPU_REG_ADDR_OUTPUT_CTRL              0x138
-#define VEPU_REG_ADDR_NEXT_PIC                 0x13c
-#define VEPU_REG_ADDR_MV_OUT                   0x140
-#define VEPU_REG_ADDR_CABAC_TBL                        0x144
-#define VEPU_REG_ROI1                          0x148
-#define     VEPU_REG_ROI1_TOP_MB(x)                    (((x) & 0xff) << 24)
-#define     VEPU_REG_ROI1_BOTTOM_MB(x)                 (((x) & 0xff) << 16)
-#define     VEPU_REG_ROI1_LEFT_MB(x)                   (((x) & 0xff) << 8)
-#define     VEPU_REG_ROI1_RIGHT_MB(x)                  (((x) & 0xff) << 0)
-#define VEPU_REG_ROI2                          0x14c
-#define     VEPU_REG_ROI2_TOP_MB(x)                    (((x) & 0xff) << 24)
-#define     VEPU_REG_ROI2_BOTTOM_MB(x)                 (((x) & 0xff) << 16)
-#define     VEPU_REG_ROI2_LEFT_MB(x)                   (((x) & 0xff) << 8)
-#define     VEPU_REG_ROI2_RIGHT_MB(x)                  (((x) & 0xff) << 0)
-#define VEPU_REG_STABLE_MATRIX(i)              (0x150 + ((i) * 0x4))
-#define VEPU_REG_STABLE_MOTION_SUM             0x174
-#define VEPU_REG_STABILIZATION_OUTPUT          0x178
-#define     VEPU_REG_STABLE_MIN_VALUE(x)               (((x) & 0xffffff) << 8)
-#define     VEPU_REG_STABLE_MODE_SEL(x)                        (((x) & 0x3) << 6)
-#define     VEPU_REG_STABLE_HOR_GMV(x)                 (((x) & 0x3f) << 0)
-#define VEPU_REG_RGB2YUV_CONVERSION_COEF1      0x17c
-#define     VEPU_REG_RGB2YUV_CONVERSION_COEFB(x)       (((x) & 0xffff) << 16)
-#define     VEPU_REG_RGB2YUV_CONVERSION_COEFA(x)       (((x) & 0xffff) << 0)
-#define VEPU_REG_RGB2YUV_CONVERSION_COEF2      0x180
-#define     VEPU_REG_RGB2YUV_CONVERSION_COEFE(x)       (((x) & 0xffff) << 16)
-#define     VEPU_REG_RGB2YUV_CONVERSION_COEFC(x)       (((x) & 0xffff) << 0)
-#define VEPU_REG_RGB2YUV_CONVERSION_COEF3      0x184
-#define     VEPU_REG_RGB2YUV_CONVERSION_COEFF(x)       (((x) & 0xffff) << 0)
-#define VEPU_REG_RGB_MASK_MSB                  0x188
-#define     VEPU_REG_RGB_MASK_B_MSB(x)                 (((x) & 0x1f) << 16)
-#define     VEPU_REG_RGB_MASK_G_MSB(x)                 (((x) & 0x1f) << 8)
-#define     VEPU_REG_RGB_MASK_R_MSB(x)                 (((x) & 0x1f) << 0)
-#define VEPU_REG_MV_PENALTY                    0x18c
-#define     VEPU_REG_1MV_PENALTY(x)                    (((x) & 0x3ff) << 21)
-#define     VEPU_REG_QMV_PENALTY(x)                    (((x) & 0x3ff) << 11)
-#define     VEPU_REG_4MV_PENALTY(x)                    (((x) & 0x3ff) << 1)
-#define     VEPU_REG_SPLIT_MV_MODE_EN                  BIT(0)
-#define VEPU_REG_QP_VAL                                0x190
-#define     VEPU_REG_H264_LUMA_INIT_QP(x)              (((x) & 0x3f) << 26)
-#define     VEPU_REG_H264_QP_MAX(x)                    (((x) & 0x3f) << 20)
-#define     VEPU_REG_H264_QP_MIN(x)                    (((x) & 0x3f) << 14)
-#define     VEPU_REG_H264_CHKPT_DISTANCE(x)            (((x) & 0xfff) << 0)
-#define VEPU_REG_VP8_SEG0_QUANT_DC_Y1          0x190
-#define     VEPU_REG_VP8_SEG0_RND_DC_Y1(x)             (((x) & 0xff) << 23)
-#define     VEPU_REG_VP8_SEG0_ZBIN_DC_Y1(x)            (((x) & 0x1ff) << 14)
-#define     VEPU_REG_VP8_SEG0_QUT_DC_Y1(x)             (((x) & 0x3fff) << 0)
-#define VEPU_REG_MVC_RELATE                    0x198
-#define     VEPU_REG_ZERO_MV_FAVOR_D2(x)               (((x) & 0xf) << 20)
-#define     VEPU_REG_PENALTY_4X4MV(x)                  (((x) & 0x1ff) << 11)
-#define     VEPU_REG_MVC_VIEW_ID(x)                    (((x) & 0x7) << 8)
-#define     VEPU_REG_MVC_ANCHOR_PIC_FLAG               BIT(7)
-#define     VEPU_REG_MVC_PRIORITY_ID(x)                        (((x) & 0x7) << 4)
-#define     VEPU_REG_MVC_TEMPORAL_ID(x)                        (((x) & 0x7) << 1)
-#define     VEPU_REG_MVC_INTER_VIEW_FLAG               BIT(0)
-#define VEPU_REG_ENCODE_START                  0x19c
-#define     VEPU_REG_MB_HEIGHT(x)                      (((x) & 0x1ff) << 20)
-#define     VEPU_REG_MB_WIDTH(x)                       (((x) & 0x1ff) << 8)
-#define     VEPU_REG_FRAME_TYPE_INTER                  (0x0 << 6)
-#define     VEPU_REG_FRAME_TYPE_INTRA                  (0x1 << 6)
-#define     VEPU_REG_FRAME_TYPE_MVCINTER               (0x2 << 6)
-#define     VEPU_REG_ENCODE_FORMAT_JPEG                        (0x2 << 4)
-#define     VEPU_REG_ENCODE_FORMAT_H264                        (0x3 << 4)
-#define     VEPU_REG_ENCODE_ENABLE                     BIT(0)
-#define VEPU_REG_MB_CTRL                       0x1a0
-#define     VEPU_REG_MB_CNT_OUT(x)                     (((x) & 0xffff) << 16)
-#define     VEPU_REG_MB_CNT_SET(x)                     (((x) & 0xffff) << 0)
-#define VEPU_REG_DATA_ENDIAN                   0x1a4
-#define     VEPU_REG_INPUT_SWAP8                       BIT(31)
-#define     VEPU_REG_INPUT_SWAP16                      BIT(30)
-#define     VEPU_REG_INPUT_SWAP32                      BIT(29)
-#define     VEPU_REG_OUTPUT_SWAP8                      BIT(28)
-#define     VEPU_REG_OUTPUT_SWAP16                     BIT(27)
-#define     VEPU_REG_OUTPUT_SWAP32                     BIT(26)
-#define     VEPU_REG_TEST_IRQ                          BIT(24)
-#define     VEPU_REG_TEST_COUNTER(x)                   (((x) & 0xf) << 20)
-#define     VEPU_REG_TEST_REG                          BIT(19)
-#define     VEPU_REG_TEST_MEMORY                       BIT(18)
-#define     VEPU_REG_TEST_LEN(x)                       (((x) & 0x3ffff) << 0)
-#define VEPU_REG_ENC_CTRL3                     0x1a8
-#define     VEPU_REG_PPS_ID(x)                         (((x) & 0xff) << 24)
-#define     VEPU_REG_INTRA_PRED_MODE(x)                        (((x) & 0xff) << 16)
-#define     VEPU_REG_FRAME_NUM(x)                      (((x) & 0xffff) << 0)
-#define VEPU_REG_ENC_CTRL4                     0x1ac
-#define     VEPU_REG_MV_PENALTY_16X8_8X16(x)           (((x) & 0x3ff) << 20)
-#define     VEPU_REG_MV_PENALTY_8X8(x)                 (((x) & 0x3ff) << 10)
-#define     VEPU_REG_MV_PENALTY_8X4_4X8(x)             (((x) & 0x3ff) << 0)
-#define VEPU_REG_ADDR_VP8_PROB_CNT             0x1b0
-#define VEPU_REG_INTERRUPT                     0x1b4
-#define     VEPU_REG_INTERRUPT_NON                     BIT(28)
-#define     VEPU_REG_MV_WRITE_EN                       BIT(24)
-#define     VEPU_REG_RECON_WRITE_DIS                   BIT(20)
-#define     VEPU_REG_INTERRUPT_SLICE_READY_EN          BIT(16)
-#define     VEPU_REG_CLK_GATING_EN                     BIT(12)
-#define     VEPU_REG_INTERRUPT_TIMEOUT_EN              BIT(10)
-#define     VEPU_REG_INTERRUPT_RESET                   BIT(9)
-#define     VEPU_REG_INTERRUPT_DIS_BIT                 BIT(8)
-#define     VEPU_REG_INTERRUPT_TIMEOUT                 BIT(6)
-#define     VEPU_REG_INTERRUPT_BUFFER_FULL             BIT(5)
-#define     VEPU_REG_INTERRUPT_BUS_ERROR               BIT(4)
-#define     VEPU_REG_INTERRUPT_FUSE                    BIT(3)
-#define     VEPU_REG_INTERRUPT_SLICE_READY             BIT(2)
-#define     VEPU_REG_INTERRUPT_FRAME_READY             BIT(1)
-#define     VEPU_REG_INTERRUPT_BIT                     BIT(0)
-#define VEPU_REG_DMV_PENALTY_TBL(i)            (0x1E0 + ((i) * 0x4))
-#define     VEPU_REG_DMV_PENALTY_TABLE_BIT(x, i)        ((x) << (i) * 8)
-#define VEPU_REG_DMV_Q_PIXEL_PENALTY_TBL(i)    (0x260 + ((i) * 0x4))
-#define     VEPU_REG_DMV_Q_PIXEL_PENALTY_TABLE_BIT(x, i)       ((x) << (i) * 8)
-
-/* vpu decoder register */
-#define VDPU_REG_DEC_CTRL0                     0x0c8 // 50
-#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_PICID(x)     (((x) & 0x1f) << 25)
-#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_THR(x)       (((x) & 0xfff) << 13)
-#define     VDPU_REG_CONFIG_TILED_MODE_LSB             BIT(12)
-#define     VDPU_REG_CONFIG_DEC_ADV_PRE_DIS            BIT(11)
-#define     VDPU_REG_CONFIG_DEC_SCMD_DIS               BIT(10)
-#define     VDPU_REG_DEC_CTRL0_SKIP_MODE               BIT(9)
-#define     VDPU_REG_DEC_CTRL0_FILTERING_DIS           BIT(8)
-#define     VDPU_REG_DEC_CTRL0_PIC_FIXED_QUANT         BIT(7)
-#define     VDPU_REG_CONFIG_DEC_LATENCY(x)             (((x) & 0x3f) << 1)
-#define     VDPU_REG_CONFIG_TILED_MODE_MSB(x)          BIT(0)
-#define     VDPU_REG_CONFIG_DEC_OUT_TILED_E            BIT(0)
-#define VDPU_REG_STREAM_LEN                    0x0cc
-#define     VDPU_REG_DEC_CTRL3_INIT_QP(x)              (((x) & 0x3f) << 25)
-#define     VDPU_REG_DEC_STREAM_LEN_HI                 BIT(24)
-#define     VDPU_REG_DEC_CTRL3_STREAM_LEN(x)           (((x) & 0xffffff) << 0)
-#define VDPU_REG_ERROR_CONCEALMENT             0x0d0
-#define     VDPU_REG_REF_BUF_CTRL2_APF_THRESHOLD(x)    (((x) & 0x3fff) << 17)
-#define     VDPU_REG_ERR_CONC_STARTMB_X(x)             (((x) & 0x1ff) << 8)
-#define     VDPU_REG_ERR_CONC_STARTMB_Y(x)             (((x) & 0xff) << 0)
-#define VDPU_REG_DEC_FORMAT                    0x0d4
-#define     VDPU_REG_DEC_CTRL0_DEC_MODE(x)             (((x) & 0xf) << 0)
-#define VDPU_REG_DATA_ENDIAN                   0x0d8
-#define     VDPU_REG_CONFIG_DEC_STRENDIAN_E            BIT(5)
-#define     VDPU_REG_CONFIG_DEC_STRSWAP32_E            BIT(4)
-#define     VDPU_REG_CONFIG_DEC_OUTSWAP32_E            BIT(3)
-#define     VDPU_REG_CONFIG_DEC_INSWAP32_E             BIT(2)
-#define     VDPU_REG_CONFIG_DEC_OUT_ENDIAN             BIT(1)
-#define     VDPU_REG_CONFIG_DEC_IN_ENDIAN              BIT(0)
-#define VDPU_REG_INTERRUPT                     0x0dc
-#define     VDPU_REG_INTERRUPT_DEC_TIMEOUT             BIT(13)
-#define     VDPU_REG_INTERRUPT_DEC_ERROR_INT           BIT(12)
-#define     VDPU_REG_INTERRUPT_DEC_PIC_INF             BIT(10)
-#define     VDPU_REG_INTERRUPT_DEC_SLICE_INT           BIT(9)
-#define     VDPU_REG_INTERRUPT_DEC_ASO_INT             BIT(8)
-#define     VDPU_REG_INTERRUPT_DEC_BUFFER_INT          BIT(6)
-#define     VDPU_REG_INTERRUPT_DEC_BUS_INT             BIT(5)
-#define     VDPU_REG_INTERRUPT_DEC_RDY_INT             BIT(4)
-#define     VDPU_REG_INTERRUPT_DEC_IRQ_DIS             BIT(1)
-#define     VDPU_REG_INTERRUPT_DEC_IRQ                 BIT(0)
-#define VDPU_REG_AXI_CTRL                      0x0e0
-#define     VDPU_REG_AXI_DEC_SEL                       BIT(23)
-#define     VDPU_REG_CONFIG_DEC_DATA_DISC_E            BIT(22)
-#define     VDPU_REG_PARAL_BUS_E(x)                    BIT(21)
-#define     VDPU_REG_CONFIG_DEC_MAX_BURST(x)           (((x) & 0x1f) << 16)
-#define     VDPU_REG_DEC_CTRL0_DEC_AXI_WR_ID(x)                (((x) & 0xff) << 8)
-#define     VDPU_REG_CONFIG_DEC_AXI_RD_ID(x)           (((x) & 0xff) << 0)
-#define VDPU_REG_EN_FLAGS                      0x0e4
-#define     VDPU_REG_AHB_HLOCK_E                       BIT(31)
-#define     VDPU_REG_CACHE_E                           BIT(29)
-#define     VDPU_REG_PREFETCH_SINGLE_CHANNEL_E         BIT(28)
-#define     VDPU_REG_INTRA_3_CYCLE_ENHANCE             BIT(27)
-#define     VDPU_REG_INTRA_DOUBLE_SPEED                        BIT(26)
-#define     VDPU_REG_INTER_DOUBLE_SPEED                        BIT(25)
-#define     VDPU_REG_DEC_CTRL3_START_CODE_E            BIT(22)
-#define     VDPU_REG_DEC_CTRL3_CH_8PIX_ILEAV_E         BIT(21)
-#define     VDPU_REG_DEC_CTRL0_RLC_MODE_E              BIT(20)
-#define     VDPU_REG_DEC_CTRL0_DIVX3_E                 BIT(19)
-#define     VDPU_REG_DEC_CTRL0_PJPEG_E                 BIT(18)
-#define     VDPU_REG_DEC_CTRL0_PIC_INTERLACE_E         BIT(17)
-#define     VDPU_REG_DEC_CTRL0_PIC_FIELDMODE_E         BIT(16)
-#define     VDPU_REG_DEC_CTRL0_PIC_B_E                 BIT(15)
-#define     VDPU_REG_DEC_CTRL0_PIC_INTER_E             BIT(14)
-#define     VDPU_REG_DEC_CTRL0_PIC_TOPFIELD_E          BIT(13)
-#define     VDPU_REG_DEC_CTRL0_FWD_INTERLACE_E         BIT(12)
-#define     VDPU_REG_DEC_CTRL0_SORENSON_E              BIT(11)
-#define     VDPU_REG_DEC_CTRL0_WRITE_MVS_E             BIT(10)
-#define     VDPU_REG_DEC_CTRL0_REF_TOPFIELD_E          BIT(9)
-#define     VDPU_REG_DEC_CTRL0_REFTOPFIRST_E           BIT(8)
-#define     VDPU_REG_DEC_CTRL0_SEQ_MBAFF_E             BIT(7)
-#define     VDPU_REG_DEC_CTRL0_PICORD_COUNT_E          BIT(6)
-#define     VDPU_REG_CONFIG_DEC_TIMEOUT_E              BIT(5)
-#define     VDPU_REG_CONFIG_DEC_CLK_GATE_E             BIT(4)
-#define     VDPU_REG_DEC_CTRL0_DEC_OUT_DIS             BIT(2)
-#define     VDPU_REG_REF_BUF_CTRL2_REFBU2_BUF_E                BIT(1)
-#define     VDPU_REG_INTERRUPT_DEC_E                   BIT(0)
-#define VDPU_REG_SOFT_RESET                    0x0e8
-#define VDPU_REG_PRED_FLT                      0x0ec
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_0(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_1(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_2(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_ADDITIONAL_CHROMA_ADDRESS     0x0f0
-#define VDPU_REG_ADDR_QTABLE                   0x0f4
-#define VDPU_REG_DIRECT_MV_ADDR                        0x0f8
-#define VDPU_REG_ADDR_DST                      0x0fc
-#define VDPU_REG_ADDR_STR                      0x100
-#define VDPU_REG_REFBUF_RELATED                        0x104
-#define VDPU_REG_FWD_PIC(i)                    (0x128 + ((i) * 0x4))
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F5(x)         (((x) & 0x1f) << 25)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F4(x)         (((x) & 0x1f) << 20)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F3(x)         (((x) & 0x1f) << 15)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F2(x)         (((x) & 0x1f) << 10)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F1(x)         (((x) & 0x1f) << 5)
-#define     VDPU_REG_FWD_PIC_PINIT_RLIST_F0(x)         (((x) & 0x1f) << 0)
-#define VDPU_REG_REF_PIC(i)                    (0x130 + ((i) * 0x4))
-#define     VDPU_REG_REF_PIC_REFER1_NBR(x)             (((x) & 0xffff) << 16)
-#define     VDPU_REG_REF_PIC_REFER0_NBR(x)             (((x) & 0xffff) << 0)
-#define VDPU_REG_H264_ADDR_REF(i)                      (0x150 + ((i) * 0x4))
-#define     VDPU_REG_ADDR_REF_FIELD_E                  BIT(1)
-#define     VDPU_REG_ADDR_REF_TOPC_E                   BIT(0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST0         0x190
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F5(x)      (((x) & 0x1f) << 25)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F4(x)      (((x) & 0x1f) << 20)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F3(x)      (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F2(x)      (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F1(x)      (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F0(x)      (((x) & 0x1f) << 0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST1         0x194
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F11(x)     (((x) & 0x1f) << 25)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F10(x)     (((x) & 0x1f) << 20)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F9(x)      (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F8(x)      (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F7(x)      (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F6(x)      (((x) & 0x1f) << 0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST2         0x198
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F15(x)     (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F14(x)     (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F13(x)     (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_F12(x)     (((x) & 0x1f) << 0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST3         0x19c
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B5(x)      (((x) & 0x1f) << 25)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B4(x)      (((x) & 0x1f) << 20)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B3(x)      (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B2(x)      (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B1(x)      (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B0(x)      (((x) & 0x1f) << 0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST4         0x1a0
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B11(x)     (((x) & 0x1f) << 25)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B10(x)     (((x) & 0x1f) << 20)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B9(x)      (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B8(x)      (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B7(x)      (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B6(x)      (((x) & 0x1f) << 0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST5         0x1a4
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B15(x)     (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B14(x)     (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B13(x)     (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_REF_PIC_BINIT_RLIST_B12(x)     (((x) & 0x1f) << 0)
-#define VDPU_REG_INITIAL_REF_PIC_LIST6         0x1a8
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F3(x)    (((x) & 0x1f) << 15)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F2(x)    (((x) & 0x1f) << 10)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F1(x)    (((x) & 0x1f) << 5)
-#define     VDPU_REG_BD_P_REF_PIC_PINIT_RLIST_F0(x)    (((x) & 0x1f) << 0)
-#define VDPU_REG_LT_REF                                0x1ac
-#define VDPU_REG_VALID_REF                     0x1b0
-#define VDPU_REG_H264_PIC_MB_SIZE              0x1b8
-#define     VDPU_REG_DEC_CTRL2_CH_QP_OFFSET2(x)                (((x) & 0x1f) << 22)
-#define     VDPU_REG_DEC_CTRL2_CH_QP_OFFSET(x)         (((x) & 0x1f) << 17)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(x)      (((x) & 0xff) << 9)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_WIDTH(x)         (((x) & 0x1ff) << 0)
-#define VDPU_REG_H264_CTRL                     0x1bc
-#define     VDPU_REG_DEC_CTRL4_WEIGHT_BIPR_IDC(x)      (((x) & 0x3) << 16)
-#define     VDPU_REG_DEC_CTRL1_REF_FRAMES(x)           (((x) & 0x1f) << 0)
-#define VDPU_REG_CURRENT_FRAME                 0x1c0
-#define     VDPU_REG_DEC_CTRL5_FILT_CTRL_PRES          BIT(31)
-#define     VDPU_REG_DEC_CTRL5_RDPIC_CNT_PRES          BIT(30)
-#define     VDPU_REG_DEC_CTRL4_FRAMENUM_LEN(x)         (((x) & 0x1f) << 16)
-#define     VDPU_REG_DEC_CTRL4_FRAMENUM(x)             (((x) & 0xffff) << 0)
-#define VDPU_REG_REF_FRAME                     0x1c4
-#define     VDPU_REG_DEC_CTRL5_REFPIC_MK_LEN(x)                (((x) & 0x7ff) << 16)
-#define     VDPU_REG_DEC_CTRL5_IDR_PIC_ID(x)           (((x) & 0xffff) << 0)
-#define VDPU_REG_DEC_CTRL6                     0x1c8
-#define     VDPU_REG_DEC_CTRL6_PPS_ID(x)               (((x) & 0xff) << 24)
-#define     VDPU_REG_DEC_CTRL6_REFIDX1_ACTIVE(x)       (((x) & 0x1f) << 19)
-#define     VDPU_REG_DEC_CTRL6_REFIDX0_ACTIVE(x)       (((x) & 0x1f) << 14)
-#define     VDPU_REG_DEC_CTRL6_POC_LENGTH(x)           (((x) & 0xff) << 0)
-#define VDPU_REG_ENABLE_FLAG                   0x1cc
-#define     VDPU_REG_DEC_CTRL5_IDR_PIC_E               BIT(8)
-#define     VDPU_REG_DEC_CTRL4_DIR_8X8_INFER_E         BIT(7)
-#define     VDPU_REG_DEC_CTRL4_BLACKWHITE_E            BIT(6)
-#define     VDPU_REG_DEC_CTRL4_CABAC_E                 BIT(5)
-#define     VDPU_REG_DEC_CTRL4_WEIGHT_PRED_E           BIT(4)
-#define     VDPU_REG_DEC_CTRL5_CONST_INTRA_E           BIT(3)
-#define     VDPU_REG_DEC_CTRL5_8X8TRANS_FLAG_E         BIT(2)
-#define     VDPU_REG_DEC_CTRL2_TYPE1_QUANT_E           BIT(1)
-#define     VDPU_REG_DEC_CTRL2_FIELDPIC_FLAG_E         BIT(0)
-#define VDPU_REG_VP8_PIC_MB_SIZE               0x1e0
-#define     VDPU_REG_DEC_PIC_MB_WIDTH(x)               (((x) & 0x1ff) << 23)
-#define            VDPU_REG_DEC_MB_WIDTH_OFF(x)                (((x) & 0xf) << 19)
-#define            VDPU_REG_DEC_PIC_MB_HEIGHT_P(x)             (((x) & 0xff) << 11)
-#define     VDPU_REG_DEC_MB_HEIGHT_OFF(x)              (((x) & 0xf) << 7)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_W_EXT(x)         (((x) & 0x7) << 3)
-#define     VDPU_REG_DEC_CTRL1_PIC_MB_H_EXT(x)         (((x) & 0x7) << 0)
-#define VDPU_REG_VP8_DCT_START_BIT             0x1e4
-#define     VDPU_REG_DEC_CTRL4_DCT1_START_BIT(x)       (((x) & 0x3f) << 26)
-#define     VDPU_REG_DEC_CTRL4_DCT2_START_BIT(x)       (((x) & 0x3f) << 20)
-#define     VDPU_REG_DEC_CTRL4_VC1_HEIGHT_EXT          BIT(13)
-#define     VDPU_REG_DEC_CTRL4_BILIN_MC_E              BIT(12)
-#define VDPU_REG_VP8_CTRL0                     0x1e8
-#define     VDPU_REG_DEC_CTRL2_STRM_START_BIT(x)       (((x) & 0x3f) << 26)
-#define     VDPU_REG_DEC_CTRL2_STRM1_START_BIT(x)      (((x) & 0x3f) << 18)
-#define     VDPU_REG_DEC_CTRL2_BOOLEAN_VALUE(x)                (((x) & 0xff) << 8)
-#define     VDPU_REG_DEC_CTRL2_BOOLEAN_RANGE(x)                (((x) & 0xff) << 0)
-#define VDPU_REG_VP8_DATA_VAL                  0x1f0
-#define     VDPU_REG_DEC_CTRL6_COEFFS_PART_AM(x)       (((x) & 0xf) << 24)
-#define     VDPU_REG_DEC_CTRL6_STREAM1_LEN(x)          (((x) & 0xffffff) << 0)
-#define VDPU_REG_PRED_FLT7                     0x1f4
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_1(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_2(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_3(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT8                     0x1f8
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_0(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_1(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_2(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT9                     0x1fc
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_6_3(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_0(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_1(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT10                    0x200
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_2(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_7_3(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_2_M1(x)       (((x) & 0x3) << 10)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_2_4(x)                (((x) & 0x3) << 8)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_4_M1(x)       (((x) & 0x3) << 6)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_4_4(x)                (((x) & 0x3) << 4)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_6_M1(x)       (((x) & 0x3) << 2)
-#define     VDPU_REG_BD_REF_PIC_PRED_TAP_6_4(x)                (((x) & 0x3) << 0)
-#define VDPU_REG_FILTER_LEVEL                  0x204
-#define     VDPU_REG_REF_PIC_LF_LEVEL_0(x)             (((x) & 0x3f) << 18)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_1(x)             (((x) & 0x3f) << 12)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_2(x)             (((x) & 0x3f) << 6)
-#define     VDPU_REG_REF_PIC_LF_LEVEL_3(x)             (((x) & 0x3f) << 0)
-#define VDPU_REG_VP8_QUANTER0                  0x208
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_0(x)          (((x) & 0x1f) << 27)
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_1(x)          (((x) & 0x1f) << 22)
-#define     VDPU_REG_REF_PIC_QUANT_0(x)                        (((x) & 0x7ff) << 11)
-#define     VDPU_REG_REF_PIC_QUANT_1(x)                        (((x) & 0x7ff) << 0)
-#define VDPU_REG_VP8_ADDR_REF0                 0x20c
-#define VDPU_REG_FILTER_MB_ADJ                 0x210
-#define     VDPU_REG_REF_PIC_FILT_TYPE_E               BIT(31)
-#define     VDPU_REG_REF_PIC_FILT_SHARPNESS(x)         (((x) & 0x7) << 28)
-#define     VDPU_REG_FILT_MB_ADJ_0(x)                  (((x) & 0x7f) << 21)
-#define     VDPU_REG_FILT_MB_ADJ_1(x)                  (((x) & 0x7f) << 14)
-#define     VDPU_REG_FILT_MB_ADJ_2(x)                  (((x) & 0x7f) << 7)
-#define     VDPU_REG_FILT_MB_ADJ_3(x)                  (((x) & 0x7f) << 0)
-#define VDPU_REG_FILTER_REF_ADJ                        0x214
-#define     VDPU_REG_REF_PIC_ADJ_0(x)                  (((x) & 0x7f) << 21)
-#define     VDPU_REG_REF_PIC_ADJ_1(x)                  (((x) & 0x7f) << 14)
-#define     VDPU_REG_REF_PIC_ADJ_2(x)                  (((x) & 0x7f) << 7)
-#define     VDPU_REG_REF_PIC_ADJ_3(x)                  (((x) & 0x7f) << 0)
-#define VDPU_REG_VP8_ADDR_REF2_5(i)            (0x218 + ((i) * 0x4))
-#define     VDPU_REG_VP8_GREF_SIGN_BIAS                        BIT(0)
-#define     VDPU_REG_VP8_AREF_SIGN_BIAS                        BIT(0)
-#define VDPU_REG_VP8_DCT_BASE(i)               (0x230 + ((i) * 0x4))
-#define VDPU_REG_VP8_ADDR_CTRL_PART            0x244
-#define VDPU_REG_VP8_ADDR_REF1                 0x250
-#define VDPU_REG_VP8_SEGMENT_VAL               0x254
-#define     VDPU_REG_FWD_PIC1_SEGMENT_BASE(x)          ((x) << 0)
-#define     VDPU_REG_FWD_PIC1_SEGMENT_UPD_E            BIT(1)
-#define     VDPU_REG_FWD_PIC1_SEGMENT_E                        BIT(0)
-#define VDPU_REG_VP8_DCT_START_BIT2            0x258
-#define     VDPU_REG_DEC_CTRL7_DCT3_START_BIT(x)       (((x) & 0x3f) << 24)
-#define     VDPU_REG_DEC_CTRL7_DCT4_START_BIT(x)       (((x) & 0x3f) << 18)
-#define     VDPU_REG_DEC_CTRL7_DCT5_START_BIT(x)       (((x) & 0x3f) << 12)
-#define     VDPU_REG_DEC_CTRL7_DCT6_START_BIT(x)       (((x) & 0x3f) << 6)
-#define     VDPU_REG_DEC_CTRL7_DCT7_START_BIT(x)       (((x) & 0x3f) << 0)
-#define VDPU_REG_VP8_QUANTER1                  0x25c
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_2(x)          (((x) & 0x1f) << 27)
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_3(x)          (((x) & 0x1f) << 22)
-#define     VDPU_REG_REF_PIC_QUANT_2(x)                        (((x) & 0x7ff) << 11)
-#define     VDPU_REG_REF_PIC_QUANT_3(x)                        (((x) & 0x7ff) << 0)
-#define VDPU_REG_VP8_QUANTER2                  0x260
-#define     VDPU_REG_REF_PIC_QUANT_DELTA_4(x)          (((x) & 0x1f) << 27)
-#define     VDPU_REG_REF_PIC_QUANT_4(x)                        (((x) & 0x7ff) << 11)
-#define     VDPU_REG_REF_PIC_QUANT_5(x)                        (((x) & 0x7ff) << 0)
-#define VDPU_REG_PRED_FLT1                     0x264
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_0_3(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_0(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_1(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT2                     0x268
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_2(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_1_3(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_0(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT3                     0x26c
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_1(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_2(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_2_3(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT4                     0x270
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_0(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_1(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_2(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT5                     0x274
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_3_3(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_0(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_1(x)       (((x) & 0x3ff) << 2)
-#define VDPU_REG_PRED_FLT6                     0x278
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_2(x)       (((x) & 0x3ff) << 22)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_4_3(x)       (((x) & 0x3ff) << 12)
-#define     VDPU_REG_PRED_FLT_PRED_BC_TAP_5_0(x)       (((x) & 0x3ff) << 2)
-
-#endif /* RK3399_VPU_REGS_H_ */
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu.h b/drivers/staging/media/rockchip/vpu/rockchip_vpu.h
deleted file mode 100644 (file)
index 3093821..0000000
+++ /dev/null
@@ -1,334 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Rockchip VPU codec driver
- *
- * Copyright 2018 Google LLC.
- *     Tomasz Figa <tfiga@chromium.org>
- *
- * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
- * Copyright (C) 2011 Samsung Electronics Co., Ltd.
- */
-
-#ifndef ROCKCHIP_VPU_H_
-#define ROCKCHIP_VPU_H_
-
-#include <linux/platform_device.h>
-#include <linux/videodev2.h>
-#include <linux/wait.h>
-#include <linux/clk.h>
-
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-ioctl.h>
-#include <media/videobuf2-core.h>
-#include <media/videobuf2-dma-contig.h>
-
-#include "rockchip_vpu_hw.h"
-
-#define ROCKCHIP_VPU_MAX_CLOCKS                4
-
-#define MPEG2_MB_DIM                   16
-#define MPEG2_MB_WIDTH(w)              DIV_ROUND_UP(w, MPEG2_MB_DIM)
-#define MPEG2_MB_HEIGHT(h)             DIV_ROUND_UP(h, MPEG2_MB_DIM)
-
-#define JPEG_MB_DIM                    16
-#define JPEG_MB_WIDTH(w)               DIV_ROUND_UP(w, JPEG_MB_DIM)
-#define JPEG_MB_HEIGHT(h)              DIV_ROUND_UP(h, JPEG_MB_DIM)
-
-struct rockchip_vpu_ctx;
-struct rockchip_vpu_codec_ops;
-
-#define RK_VPU_JPEG_ENCODER    BIT(0)
-#define RK_VPU_ENCODERS                0x0000ffff
-
-#define RK_VPU_MPEG2_DECODER   BIT(16)
-#define RK_VPU_DECODERS                0xffff0000
-
-/**
- * struct rockchip_vpu_variant - information about VPU hardware variant
- *
- * @enc_offset:                        Offset from VPU base to encoder registers.
- * @dec_offset:                        Offset from VPU base to decoder registers.
- * @enc_fmts:                  Encoder formats.
- * @num_enc_fmts:              Number of encoder formats.
- * @dec_fmts:                  Decoder formats.
- * @num_dec_fmts:              Number of decoder formats.
- * @codec:                     Supported codecs
- * @codec_ops:                 Codec ops.
- * @init:                      Initialize hardware.
- * @vepu_irq:                  encoder interrupt handler
- * @vdpu_irq:                  decoder interrupt handler
- * @clk_names:                 array of clock names
- * @num_clocks:                        number of clocks in the array
- */
-struct rockchip_vpu_variant {
-       unsigned int enc_offset;
-       unsigned int dec_offset;
-       const struct rockchip_vpu_fmt *enc_fmts;
-       unsigned int num_enc_fmts;
-       const struct rockchip_vpu_fmt *dec_fmts;
-       unsigned int num_dec_fmts;
-       unsigned int codec;
-       const struct rockchip_vpu_codec_ops *codec_ops;
-       int (*init)(struct rockchip_vpu_dev *vpu);
-       irqreturn_t (*vepu_irq)(int irq, void *priv);
-       irqreturn_t (*vdpu_irq)(int irq, void *priv);
-       const char *clk_names[ROCKCHIP_VPU_MAX_CLOCKS];
-       int num_clocks;
-};
-
-/**
- * enum rockchip_vpu_codec_mode - codec operating mode.
- * @RK_VPU_MODE_NONE:  No operating mode. Used for RAW video formats.
- * @RK_VPU_MODE_JPEG_ENC: JPEG encoder.
- * @RK_VPU_MODE_MPEG2_DEC: MPEG-2 decoder.
- */
-enum rockchip_vpu_codec_mode {
-       RK_VPU_MODE_NONE = -1,
-       RK_VPU_MODE_JPEG_ENC,
-       RK_VPU_MODE_MPEG2_DEC,
-};
-
-/*
- * struct rockchip_vpu_ctrl - helper type to declare supported controls
- * @id:                V4L2 control ID (V4L2_CID_xxx)
- * @codec:     codec id this control belong to (RK_VPU_JPEG_ENCODER, etc.)
- * @cfg:       control configuration
- */
-struct rockchip_vpu_ctrl {
-       unsigned int id;
-       unsigned int codec;
-       struct v4l2_ctrl_config cfg;
-};
-
-/*
- * struct rockchip_vpu_func - rockchip VPU functionality
- *
- * @id:                        processing functionality ID (can be
- *                     %MEDIA_ENT_F_PROC_VIDEO_ENCODER or
- *                     %MEDIA_ENT_F_PROC_VIDEO_DECODER)
- * @vdev:              &struct video_device that exposes the encoder or
- *                     decoder functionality
- * @source_pad:                &struct media_pad with the source pad.
- * @sink:              &struct media_entity pointer with the sink entity
- * @sink_pad:          &struct media_pad with the sink pad.
- * @proc:              &struct media_entity pointer with the M2M device itself.
- * @proc_pads:         &struct media_pad with the @proc pads.
- * @intf_devnode:      &struct media_intf devnode pointer with the interface
- *                     with controls the M2M device.
- *
- * Contains everything needed to attach the video device to the media device.
- */
-struct rockchip_vpu_func {
-       unsigned int id;
-       struct video_device vdev;
-       struct media_pad source_pad;
-       struct media_entity sink;
-       struct media_pad sink_pad;
-       struct media_entity proc;
-       struct media_pad proc_pads[2];
-       struct media_intf_devnode *intf_devnode;
-};
-
-static inline struct rockchip_vpu_func *
-rockchip_vpu_vdev_to_func(struct video_device *vdev)
-{
-       return container_of(vdev, struct rockchip_vpu_func, vdev);
-}
-
-/**
- * struct rockchip_vpu_dev - driver data
- * @v4l2_dev:          V4L2 device to register video devices for.
- * @m2m_dev:           mem2mem device associated to this device.
- * @mdev:              media device associated to this device.
- * @encoder:           encoder functionality.
- * @decoder:           decoder functionality.
- * @pdev:              Pointer to VPU platform device.
- * @dev:               Pointer to device for convenient logging using
- *                     dev_ macros.
- * @clocks:            Array of clock handles.
- * @base:              Mapped address of VPU registers.
- * @enc_base:          Mapped address of VPU encoder register for convenience.
- * @dec_base:          Mapped address of VPU decoder register for convenience.
- * @vpu_mutex:         Mutex to synchronize V4L2 calls.
- * @irqlock:           Spinlock to synchronize access to data structures
- *                     shared with interrupt handlers.
- * @variant:           Hardware variant-specific parameters.
- * @watchdog_work:     Delayed work for hardware timeout handling.
- */
-struct rockchip_vpu_dev {
-       struct v4l2_device v4l2_dev;
-       struct v4l2_m2m_dev *m2m_dev;
-       struct media_device mdev;
-       struct rockchip_vpu_func *encoder;
-       struct rockchip_vpu_func *decoder;
-       struct platform_device *pdev;
-       struct device *dev;
-       struct clk_bulk_data clocks[ROCKCHIP_VPU_MAX_CLOCKS];
-       void __iomem *base;
-       void __iomem *enc_base;
-       void __iomem *dec_base;
-
-       struct mutex vpu_mutex; /* video_device lock */
-       spinlock_t irqlock;
-       const struct rockchip_vpu_variant *variant;
-       struct delayed_work watchdog_work;
-};
-
-/**
- * struct rockchip_vpu_ctx - Context (instance) private data.
- *
- * @dev:               VPU driver data to which the context belongs.
- * @fh:                        V4L2 file handler.
- *
- * @sequence_cap:       Sequence counter for capture queue
- * @sequence_out:       Sequence counter for output queue
- *
- * @vpu_src_fmt:       Descriptor of active source format.
- * @src_fmt:           V4L2 pixel format of active source format.
- * @vpu_dst_fmt:       Descriptor of active destination format.
- * @dst_fmt:           V4L2 pixel format of active destination format.
- *
- * @ctrl_handler:      Control handler used to register controls.
- * @jpeg_quality:      User-specified JPEG compression quality.
- *
- * @buf_finish:                Buffer finish. This depends on encoder or decoder
- *                     context, and it's called right before
- *                     calling v4l2_m2m_job_finish.
- * @codec_ops:         Set of operations related to codec mode.
- * @jpeg_enc:          JPEG-encoding context.
- * @mpeg2_dec:         MPEG-2-decoding context.
- */
-struct rockchip_vpu_ctx {
-       struct rockchip_vpu_dev *dev;
-       struct v4l2_fh fh;
-
-       u32 sequence_cap;
-       u32 sequence_out;
-
-       const struct rockchip_vpu_fmt *vpu_src_fmt;
-       struct v4l2_pix_format_mplane src_fmt;
-       const struct rockchip_vpu_fmt *vpu_dst_fmt;
-       struct v4l2_pix_format_mplane dst_fmt;
-
-       struct v4l2_ctrl_handler ctrl_handler;
-       int jpeg_quality;
-
-       int (*buf_finish)(struct rockchip_vpu_ctx *ctx,
-                         struct vb2_buffer *buf,
-                         unsigned int bytesused);
-
-       const struct rockchip_vpu_codec_ops *codec_ops;
-
-       /* Specific for particular codec modes. */
-       union {
-               struct rockchip_vpu_jpeg_enc_hw_ctx jpeg_enc;
-               struct rockchip_vpu_mpeg2_dec_hw_ctx mpeg2_dec;
-       };
-};
-
-/**
- * struct rockchip_vpu_fmt - information about supported video formats.
- * @name:      Human readable name of the format.
- * @fourcc:    FourCC code of the format. See V4L2_PIX_FMT_*.
- * @codec_mode:        Codec mode related to this format. See
- *             enum rockchip_vpu_codec_mode.
- * @header_size: Optional header size. Currently used by JPEG encoder.
- * @max_depth: Maximum depth, for bitstream formats
- * @enc_fmt:   Format identifier for encoder registers.
- * @frmsize:   Supported range of frame sizes (only for bitstream formats).
- */
-struct rockchip_vpu_fmt {
-       char *name;
-       u32 fourcc;
-       enum rockchip_vpu_codec_mode codec_mode;
-       int header_size;
-       int max_depth;
-       enum rockchip_vpu_enc_fmt enc_fmt;
-       struct v4l2_frmsize_stepwise frmsize;
-};
-
-/* Logging helpers */
-
-/**
- * debug - Module parameter to control level of debugging messages.
- *
- * Level of debugging messages can be controlled by bits of
- * module parameter called "debug". Meaning of particular
- * bits is as follows:
- *
- * bit 0 - global information: mode, size, init, release
- * bit 1 - each run start/result information
- * bit 2 - contents of small controls from userspace
- * bit 3 - contents of big controls from userspace
- * bit 4 - detail fmt, ctrl, buffer q/dq information
- * bit 5 - detail function enter/leave trace information
- * bit 6 - register write/read information
- */
-extern int rockchip_vpu_debug;
-
-#define vpu_debug(level, fmt, args...)                         \
-       do {                                                    \
-               if (rockchip_vpu_debug & BIT(level))            \
-                       pr_info("%s:%d: " fmt,                  \
-                                __func__, __LINE__, ##args);   \
-       } while (0)
-
-#define vpu_err(fmt, args...)                                  \
-       pr_err("%s:%d: " fmt, __func__, __LINE__, ##args)
-
-/* Structure access helpers. */
-static inline struct rockchip_vpu_ctx *fh_to_ctx(struct v4l2_fh *fh)
-{
-       return container_of(fh, struct rockchip_vpu_ctx, fh);
-}
-
-/* Register accessors. */
-static inline void vepu_write_relaxed(struct rockchip_vpu_dev *vpu,
-                                     u32 val, u32 reg)
-{
-       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
-       writel_relaxed(val, vpu->enc_base + reg);
-}
-
-static inline void vepu_write(struct rockchip_vpu_dev *vpu, u32 val, u32 reg)
-{
-       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
-       writel(val, vpu->enc_base + reg);
-}
-
-static inline u32 vepu_read(struct rockchip_vpu_dev *vpu, u32 reg)
-{
-       u32 val = readl(vpu->enc_base + reg);
-
-       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
-       return val;
-}
-
-static inline void vdpu_write_relaxed(struct rockchip_vpu_dev *vpu,
-                                     u32 val, u32 reg)
-{
-       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
-       writel_relaxed(val, vpu->dec_base + reg);
-}
-
-static inline void vdpu_write(struct rockchip_vpu_dev *vpu, u32 val, u32 reg)
-{
-       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
-       writel(val, vpu->dec_base + reg);
-}
-
-static inline u32 vdpu_read(struct rockchip_vpu_dev *vpu, u32 reg)
-{
-       u32 val = readl(vpu->dec_base + reg);
-
-       vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
-       return val;
-}
-
-bool rockchip_vpu_is_encoder_ctx(const struct rockchip_vpu_ctx *ctx);
-
-void *rockchip_vpu_get_ctrl(struct rockchip_vpu_ctx *ctx, u32 id);
-dma_addr_t rockchip_vpu_get_ref(struct vb2_queue *q, u64 ts);
-
-#endif /* ROCKCHIP_VPU_H_ */
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
deleted file mode 100644 (file)
index b94ff97..0000000
+++ /dev/null
@@ -1,857 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Collabora, Ltd.
- * Copyright 2018 Google LLC.
- *     Tomasz Figa <tfiga@chromium.org>
- *
- * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
- * Copyright (C) 2011 Samsung Electronics Co., Ltd.
- */
-
-#include <linux/clk.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/pm.h>
-#include <linux/pm_runtime.h>
-#include <linux/slab.h>
-#include <linux/videodev2.h>
-#include <linux/workqueue.h>
-#include <media/v4l2-event.h>
-#include <media/v4l2-mem2mem.h>
-#include <media/videobuf2-core.h>
-#include <media/videobuf2-vmalloc.h>
-
-#include "rockchip_vpu_v4l2.h"
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_hw.h"
-
-#define DRIVER_NAME "rockchip-vpu"
-
-int rockchip_vpu_debug;
-module_param_named(debug, rockchip_vpu_debug, int, 0644);
-MODULE_PARM_DESC(debug,
-                "Debug level - higher value produces more verbose messages");
-
-void *rockchip_vpu_get_ctrl(struct rockchip_vpu_ctx *ctx, u32 id)
-{
-       struct v4l2_ctrl *ctrl;
-
-       ctrl = v4l2_ctrl_find(&ctx->ctrl_handler, id);
-       return ctrl ? ctrl->p_cur.p : NULL;
-}
-
-dma_addr_t rockchip_vpu_get_ref(struct vb2_queue *q, u64 ts)
-{
-       int index;
-
-       index = vb2_find_timestamp(q, ts, 0);
-       if (index >= 0)
-               return vb2_dma_contig_plane_dma_addr(q->bufs[index], 0);
-       return 0;
-}
-
-static int
-rockchip_vpu_enc_buf_finish(struct rockchip_vpu_ctx *ctx,
-                           struct vb2_buffer *buf,
-                           unsigned int bytesused)
-{
-       size_t avail_size;
-
-       avail_size = vb2_plane_size(buf, 0) - ctx->vpu_dst_fmt->header_size;
-       if (bytesused > avail_size)
-               return -EINVAL;
-       /*
-        * The bounce buffer is only for the JPEG encoder.
-        * TODO: Rework the JPEG encoder to eliminate the need
-        * for a bounce buffer.
-        */
-       if (ctx->jpeg_enc.bounce_buffer.cpu) {
-               memcpy(vb2_plane_vaddr(buf, 0) +
-                      ctx->vpu_dst_fmt->header_size,
-                      ctx->jpeg_enc.bounce_buffer.cpu, bytesused);
-       }
-       buf->planes[0].bytesused =
-               ctx->vpu_dst_fmt->header_size + bytesused;
-       return 0;
-}
-
-static int
-rockchip_vpu_dec_buf_finish(struct rockchip_vpu_ctx *ctx,
-                           struct vb2_buffer *buf,
-                           unsigned int bytesused)
-{
-       /* For decoders set bytesused as per the output picture. */
-       buf->planes[0].bytesused = ctx->dst_fmt.plane_fmt[0].sizeimage;
-       return 0;
-}
-
-static void rockchip_vpu_job_finish(struct rockchip_vpu_dev *vpu,
-                                   struct rockchip_vpu_ctx *ctx,
-                                   unsigned int bytesused,
-                                   enum vb2_buffer_state result)
-{
-       struct vb2_v4l2_buffer *src, *dst;
-       int ret;
-
-       pm_runtime_mark_last_busy(vpu->dev);
-       pm_runtime_put_autosuspend(vpu->dev);
-       clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks);
-
-       src = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-       dst = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-
-       if (WARN_ON(!src))
-               return;
-       if (WARN_ON(!dst))
-               return;
-
-       src->sequence = ctx->sequence_out++;
-       dst->sequence = ctx->sequence_cap++;
-
-       v4l2_m2m_buf_copy_metadata(src, dst, true);
-
-       ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
-       if (ret)
-               result = VB2_BUF_STATE_ERROR;
-
-       v4l2_m2m_buf_done(src, result);
-       v4l2_m2m_buf_done(dst, result);
-
-       v4l2_m2m_job_finish(vpu->m2m_dev, ctx->fh.m2m_ctx);
-}
-
-void rockchip_vpu_irq_done(struct rockchip_vpu_dev *vpu,
-                          unsigned int bytesused,
-                          enum vb2_buffer_state result)
-{
-       struct rockchip_vpu_ctx *ctx =
-               v4l2_m2m_get_curr_priv(vpu->m2m_dev);
-
-       /*
-        * If cancel_delayed_work returns false
-        * the timeout expired. The watchdog is running,
-        * and will take care of finishing the job.
-        */
-       if (cancel_delayed_work(&vpu->watchdog_work))
-               rockchip_vpu_job_finish(vpu, ctx, bytesused, result);
-}
-
-void rockchip_vpu_watchdog(struct work_struct *work)
-{
-       struct rockchip_vpu_dev *vpu;
-       struct rockchip_vpu_ctx *ctx;
-
-       vpu = container_of(to_delayed_work(work),
-                          struct rockchip_vpu_dev, watchdog_work);
-       ctx = v4l2_m2m_get_curr_priv(vpu->m2m_dev);
-       if (ctx) {
-               vpu_err("frame processing timed out!\n");
-               ctx->codec_ops->reset(ctx);
-               rockchip_vpu_job_finish(vpu, ctx, 0, VB2_BUF_STATE_ERROR);
-       }
-}
-
-static void device_run(void *priv)
-{
-       struct rockchip_vpu_ctx *ctx = priv;
-       int ret;
-
-       ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
-       if (ret)
-               goto err_cancel_job;
-       ret = pm_runtime_get_sync(ctx->dev->dev);
-       if (ret < 0)
-               goto err_cancel_job;
-
-       ctx->codec_ops->run(ctx);
-       return;
-
-err_cancel_job:
-       rockchip_vpu_job_finish(ctx->dev, ctx, 0, VB2_BUF_STATE_ERROR);
-}
-
-bool rockchip_vpu_is_encoder_ctx(const struct rockchip_vpu_ctx *ctx)
-{
-       return ctx->buf_finish == rockchip_vpu_enc_buf_finish;
-}
-
-static struct v4l2_m2m_ops vpu_m2m_ops = {
-       .device_run = device_run,
-};
-
-static int
-queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
-{
-       struct rockchip_vpu_ctx *ctx = priv;
-       int ret;
-
-       src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-       src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-       src_vq->drv_priv = ctx;
-       src_vq->ops = &rockchip_vpu_queue_ops;
-       src_vq->mem_ops = &vb2_dma_contig_memops;
-
-       /*
-        * Driver does mostly sequential access, so sacrifice TLB efficiency
-        * for faster allocation. Also, no CPU access on the source queue,
-        * so no kernel mapping needed.
-        */
-       src_vq->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES |
-                           DMA_ATTR_NO_KERNEL_MAPPING;
-       src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-       src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-       src_vq->lock = &ctx->dev->vpu_mutex;
-       src_vq->dev = ctx->dev->v4l2_dev.dev;
-       src_vq->supports_requests = true;
-
-       ret = vb2_queue_init(src_vq);
-       if (ret)
-               return ret;
-
-       /*
-        * When encoding, the CAPTURE queue doesn't need dma memory,
-        * as the CPU needs to create the JPEG frames, from the
-        * hardware-produced JPEG payload.
-        *
-        * For the DMA destination buffer, we use a bounce buffer.
-        */
-       if (rockchip_vpu_is_encoder_ctx(ctx)) {
-               dst_vq->mem_ops = &vb2_vmalloc_memops;
-       } else {
-               dst_vq->bidirectional = true;
-               dst_vq->mem_ops = &vb2_dma_contig_memops;
-               dst_vq->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES |
-                                   DMA_ATTR_NO_KERNEL_MAPPING;
-       }
-
-       dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-       dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-       dst_vq->drv_priv = ctx;
-       dst_vq->ops = &rockchip_vpu_queue_ops;
-       dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-       dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-       dst_vq->lock = &ctx->dev->vpu_mutex;
-       dst_vq->dev = ctx->dev->v4l2_dev.dev;
-
-       return vb2_queue_init(dst_vq);
-}
-
-static int rockchip_vpu_s_ctrl(struct v4l2_ctrl *ctrl)
-{
-       struct rockchip_vpu_ctx *ctx;
-
-       ctx = container_of(ctrl->handler,
-                          struct rockchip_vpu_ctx, ctrl_handler);
-
-       vpu_debug(1, "s_ctrl: id = %d, val = %d\n", ctrl->id, ctrl->val);
-
-       switch (ctrl->id) {
-       case V4L2_CID_JPEG_COMPRESSION_QUALITY:
-               ctx->jpeg_quality = ctrl->val;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static const struct v4l2_ctrl_ops rockchip_vpu_ctrl_ops = {
-       .s_ctrl = rockchip_vpu_s_ctrl,
-};
-
-static struct rockchip_vpu_ctrl controls[] = {
-       {
-               .id = V4L2_CID_JPEG_COMPRESSION_QUALITY,
-               .codec = RK_VPU_JPEG_ENCODER,
-               .cfg = {
-                       .min = 5,
-                       .max = 100,
-                       .step = 1,
-                       .def = 50,
-               },
-       }, {
-               .id = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
-               .codec = RK_VPU_MPEG2_DECODER,
-               .cfg = {
-                       .elem_size = sizeof(struct v4l2_ctrl_mpeg2_slice_params),
-               },
-       }, {
-               .id = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
-               .codec = RK_VPU_MPEG2_DECODER,
-               .cfg = {
-                       .elem_size = sizeof(struct v4l2_ctrl_mpeg2_quantization),
-               },
-       },
-};
-
-static int rockchip_vpu_ctrls_setup(struct rockchip_vpu_dev *vpu,
-                                   struct rockchip_vpu_ctx *ctx,
-                                   int allowed_codecs)
-{
-       int i, num_ctrls = ARRAY_SIZE(controls);
-
-       v4l2_ctrl_handler_init(&ctx->ctrl_handler, num_ctrls);
-
-       for (i = 0; i < num_ctrls; i++) {
-               if (!(allowed_codecs & controls[i].codec))
-                       continue;
-               if (!controls[i].cfg.elem_size) {
-                       v4l2_ctrl_new_std(&ctx->ctrl_handler,
-                                         &rockchip_vpu_ctrl_ops,
-                                         controls[i].id, controls[i].cfg.min,
-                                         controls[i].cfg.max,
-                                         controls[i].cfg.step,
-                                         controls[i].cfg.def);
-               } else {
-                       controls[i].cfg.id = controls[i].id;
-                       v4l2_ctrl_new_custom(&ctx->ctrl_handler,
-                                            &controls[i].cfg, NULL);
-               }
-
-               if (ctx->ctrl_handler.error) {
-                       vpu_err("Adding control (%d) failed %d\n",
-                               controls[i].id,
-                               ctx->ctrl_handler.error);
-                       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
-                       return ctx->ctrl_handler.error;
-               }
-       }
-       return v4l2_ctrl_handler_setup(&ctx->ctrl_handler);
-}
-
-/*
- * V4L2 file operations.
- */
-
-static int rockchip_vpu_open(struct file *filp)
-{
-       struct rockchip_vpu_dev *vpu = video_drvdata(filp);
-       struct video_device *vdev = video_devdata(filp);
-       struct rockchip_vpu_func *func = rockchip_vpu_vdev_to_func(vdev);
-       struct rockchip_vpu_ctx *ctx;
-       int allowed_codecs, ret;
-
-       /*
-        * We do not need any extra locking here, because we operate only
-        * on local data here, except reading few fields from dev, which
-        * do not change through device's lifetime (which is guaranteed by
-        * reference on module from open()) and V4L2 internal objects (such
-        * as vdev and ctx->fh), which have proper locking done in respective
-        * helper functions used here.
-        */
-
-       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-       if (!ctx)
-               return -ENOMEM;
-
-       ctx->dev = vpu;
-       if (func->id == MEDIA_ENT_F_PROC_VIDEO_ENCODER) {
-               allowed_codecs = vpu->variant->codec & RK_VPU_ENCODERS;
-               ctx->buf_finish = rockchip_vpu_enc_buf_finish;
-               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(vpu->m2m_dev, ctx,
-                                                   queue_init);
-       } else if (func->id == MEDIA_ENT_F_PROC_VIDEO_DECODER) {
-               allowed_codecs = vpu->variant->codec & RK_VPU_DECODERS;
-               ctx->buf_finish = rockchip_vpu_dec_buf_finish;
-               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(vpu->m2m_dev, ctx,
-                                                   queue_init);
-       } else {
-               ctx->fh.m2m_ctx = ERR_PTR(-ENODEV);
-       }
-       if (IS_ERR(ctx->fh.m2m_ctx)) {
-               ret = PTR_ERR(ctx->fh.m2m_ctx);
-               kfree(ctx);
-               return ret;
-       }
-
-       v4l2_fh_init(&ctx->fh, vdev);
-       filp->private_data = &ctx->fh;
-       v4l2_fh_add(&ctx->fh);
-
-       rockchip_vpu_reset_fmts(ctx);
-
-       ret = rockchip_vpu_ctrls_setup(vpu, ctx, allowed_codecs);
-       if (ret) {
-               vpu_err("Failed to set up controls\n");
-               goto err_fh_free;
-       }
-       ctx->fh.ctrl_handler = &ctx->ctrl_handler;
-
-       return 0;
-
-err_fh_free:
-       v4l2_fh_del(&ctx->fh);
-       v4l2_fh_exit(&ctx->fh);
-       kfree(ctx);
-       return ret;
-}
-
-static int rockchip_vpu_release(struct file *filp)
-{
-       struct rockchip_vpu_ctx *ctx =
-               container_of(filp->private_data, struct rockchip_vpu_ctx, fh);
-
-       /*
-        * No need for extra locking because this was the last reference
-        * to this file.
-        */
-       v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
-       v4l2_fh_del(&ctx->fh);
-       v4l2_fh_exit(&ctx->fh);
-       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
-       kfree(ctx);
-
-       return 0;
-}
-
-static const struct v4l2_file_operations rockchip_vpu_fops = {
-       .owner = THIS_MODULE,
-       .open = rockchip_vpu_open,
-       .release = rockchip_vpu_release,
-       .poll = v4l2_m2m_fop_poll,
-       .unlocked_ioctl = video_ioctl2,
-       .mmap = v4l2_m2m_fop_mmap,
-};
-
-static const struct of_device_id of_rockchip_vpu_match[] = {
-       { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
-       { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, },
-       { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, of_rockchip_vpu_match);
-
-static int rockchip_vpu_register_entity(struct media_device *mdev,
-                                       struct media_entity *entity,
-                                       const char *entity_name,
-                                       struct media_pad *pads, int num_pads,
-                                       int function,
-                                       struct video_device *vdev)
-{
-       char *name;
-       int ret;
-
-       entity->obj_type = MEDIA_ENTITY_TYPE_BASE;
-       if (function == MEDIA_ENT_F_IO_V4L) {
-               entity->info.dev.major = VIDEO_MAJOR;
-               entity->info.dev.minor = vdev->minor;
-       }
-
-       name = devm_kasprintf(mdev->dev, GFP_KERNEL, "%s-%s", vdev->name,
-                             entity_name);
-       if (!name)
-               return -ENOMEM;
-
-       entity->name = name;
-       entity->function = function;
-
-       ret = media_entity_pads_init(entity, num_pads, pads);
-       if (ret)
-               return ret;
-
-       ret = media_device_register_entity(mdev, entity);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static int rockchip_attach_func(struct rockchip_vpu_dev *vpu,
-                               struct rockchip_vpu_func *func)
-{
-       struct media_device *mdev = &vpu->mdev;
-       struct media_link *link;
-       int ret;
-
-       /* Create the three encoder entities with their pads */
-       func->source_pad.flags = MEDIA_PAD_FL_SOURCE;
-       ret = rockchip_vpu_register_entity(mdev, &func->vdev.entity,
-                                          "source", &func->source_pad, 1,
-                                          MEDIA_ENT_F_IO_V4L, &func->vdev);
-       if (ret)
-               return ret;
-
-       func->proc_pads[0].flags = MEDIA_PAD_FL_SINK;
-       func->proc_pads[1].flags = MEDIA_PAD_FL_SOURCE;
-       ret = rockchip_vpu_register_entity(mdev, &func->proc, "proc",
-                                          func->proc_pads, 2, func->id,
-                                          &func->vdev);
-       if (ret)
-               goto err_rel_entity0;
-
-       func->sink_pad.flags = MEDIA_PAD_FL_SINK;
-       ret = rockchip_vpu_register_entity(mdev, &func->sink, "sink",
-                                          &func->sink_pad, 1,
-                                          MEDIA_ENT_F_IO_V4L, &func->vdev);
-       if (ret)
-               goto err_rel_entity1;
-
-       /* Connect the three entities */
-       ret = media_create_pad_link(&func->vdev.entity, 0, &func->proc, 1,
-                                   MEDIA_LNK_FL_IMMUTABLE |
-                                   MEDIA_LNK_FL_ENABLED);
-       if (ret)
-               goto err_rel_entity2;
-
-       ret = media_create_pad_link(&func->proc, 0, &func->sink, 0,
-                                   MEDIA_LNK_FL_IMMUTABLE |
-                                   MEDIA_LNK_FL_ENABLED);
-       if (ret)
-               goto err_rm_links0;
-
-       /* Create video interface */
-       func->intf_devnode = media_devnode_create(mdev, MEDIA_INTF_T_V4L_VIDEO,
-                                                 0, VIDEO_MAJOR,
-                                                 func->vdev.minor);
-       if (!func->intf_devnode) {
-               ret = -ENOMEM;
-               goto err_rm_links1;
-       }
-
-       /* Connect the two DMA engines to the interface */
-       link = media_create_intf_link(&func->vdev.entity,
-                                     &func->intf_devnode->intf,
-                                     MEDIA_LNK_FL_IMMUTABLE |
-                                     MEDIA_LNK_FL_ENABLED);
-       if (!link) {
-               ret = -ENOMEM;
-               goto err_rm_devnode;
-       }
-
-       link = media_create_intf_link(&func->sink, &func->intf_devnode->intf,
-                                     MEDIA_LNK_FL_IMMUTABLE |
-                                     MEDIA_LNK_FL_ENABLED);
-       if (!link) {
-               ret = -ENOMEM;
-               goto err_rm_devnode;
-       }
-       return 0;
-
-err_rm_devnode:
-       media_devnode_remove(func->intf_devnode);
-
-err_rm_links1:
-       media_entity_remove_links(&func->sink);
-
-err_rm_links0:
-       media_entity_remove_links(&func->proc);
-       media_entity_remove_links(&func->vdev.entity);
-
-err_rel_entity2:
-       media_device_unregister_entity(&func->sink);
-
-err_rel_entity1:
-       media_device_unregister_entity(&func->proc);
-
-err_rel_entity0:
-       media_device_unregister_entity(&func->vdev.entity);
-       return ret;
-}
-
-static void rockchip_detach_func(struct rockchip_vpu_func *func)
-{
-       media_devnode_remove(func->intf_devnode);
-       media_entity_remove_links(&func->sink);
-       media_entity_remove_links(&func->proc);
-       media_entity_remove_links(&func->vdev.entity);
-       media_device_unregister_entity(&func->sink);
-       media_device_unregister_entity(&func->proc);
-       media_device_unregister_entity(&func->vdev.entity);
-}
-
-static int rockchip_vpu_add_func(struct rockchip_vpu_dev *vpu,
-                                unsigned int funcid)
-{
-       const struct of_device_id *match;
-       struct rockchip_vpu_func *func;
-       struct video_device *vfd;
-       int ret;
-
-       match = of_match_node(of_rockchip_vpu_match, vpu->dev->of_node);
-       func = devm_kzalloc(vpu->dev, sizeof(*func), GFP_KERNEL);
-       if (!func) {
-               v4l2_err(&vpu->v4l2_dev, "Failed to allocate video device\n");
-               return -ENOMEM;
-       }
-
-       func->id = funcid;
-
-       vfd = &func->vdev;
-       vfd->fops = &rockchip_vpu_fops;
-       vfd->release = video_device_release_empty;
-       vfd->lock = &vpu->vpu_mutex;
-       vfd->v4l2_dev = &vpu->v4l2_dev;
-       vfd->vfl_dir = VFL_DIR_M2M;
-       vfd->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M_MPLANE;
-       vfd->ioctl_ops = &rockchip_vpu_ioctl_ops;
-       snprintf(vfd->name, sizeof(vfd->name), "%s-%s", match->compatible,
-                funcid == MEDIA_ENT_F_PROC_VIDEO_ENCODER ? "enc" : "dec");
-
-       if (funcid == MEDIA_ENT_F_PROC_VIDEO_ENCODER)
-               vpu->encoder = func;
-       else
-               vpu->decoder = func;
-
-       video_set_drvdata(vfd, vpu);
-
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
-       if (ret) {
-               v4l2_err(&vpu->v4l2_dev, "Failed to register video device\n");
-               return ret;
-       }
-
-       ret = rockchip_attach_func(vpu, func);
-       if (ret) {
-               v4l2_err(&vpu->v4l2_dev,
-                        "Failed to attach functionality to the media device\n");
-               goto err_unreg_dev;
-       }
-
-       v4l2_info(&vpu->v4l2_dev, "registered as /dev/video%d\n", vfd->num);
-
-       return 0;
-
-err_unreg_dev:
-       video_unregister_device(vfd);
-       return ret;
-}
-
-static int rockchip_vpu_add_enc_func(struct rockchip_vpu_dev *vpu)
-{
-       if (!vpu->variant->enc_fmts)
-               return 0;
-
-       return rockchip_vpu_add_func(vpu, MEDIA_ENT_F_PROC_VIDEO_ENCODER);
-}
-
-static int rockchip_vpu_add_dec_func(struct rockchip_vpu_dev *vpu)
-{
-       if (!vpu->variant->dec_fmts)
-               return 0;
-
-       return rockchip_vpu_add_func(vpu, MEDIA_ENT_F_PROC_VIDEO_DECODER);
-}
-
-static void rockchip_vpu_remove_func(struct rockchip_vpu_dev *vpu,
-                                    unsigned int funcid)
-{
-       struct rockchip_vpu_func *func;
-
-       if (funcid == MEDIA_ENT_F_PROC_VIDEO_ENCODER)
-               func = vpu->encoder;
-       else
-               func = vpu->decoder;
-
-       if (!func)
-               return;
-
-       rockchip_detach_func(func);
-       video_unregister_device(&func->vdev);
-}
-
-static void rockchip_vpu_remove_enc_func(struct rockchip_vpu_dev *vpu)
-{
-       rockchip_vpu_remove_func(vpu, MEDIA_ENT_F_PROC_VIDEO_ENCODER);
-}
-
-static void rockchip_vpu_remove_dec_func(struct rockchip_vpu_dev *vpu)
-{
-       rockchip_vpu_remove_func(vpu, MEDIA_ENT_F_PROC_VIDEO_DECODER);
-}
-
-static const struct media_device_ops rockchip_m2m_media_ops = {
-       .req_validate = vb2_request_validate,
-       .req_queue = v4l2_m2m_request_queue,
-};
-
-static int rockchip_vpu_probe(struct platform_device *pdev)
-{
-       const struct of_device_id *match;
-       struct rockchip_vpu_dev *vpu;
-       struct resource *res;
-       int i, ret;
-
-       vpu = devm_kzalloc(&pdev->dev, sizeof(*vpu), GFP_KERNEL);
-       if (!vpu)
-               return -ENOMEM;
-
-       vpu->dev = &pdev->dev;
-       vpu->pdev = pdev;
-       mutex_init(&vpu->vpu_mutex);
-       spin_lock_init(&vpu->irqlock);
-
-       match = of_match_node(of_rockchip_vpu_match, pdev->dev.of_node);
-       vpu->variant = match->data;
-
-       INIT_DELAYED_WORK(&vpu->watchdog_work, rockchip_vpu_watchdog);
-
-       for (i = 0; i < vpu->variant->num_clocks; i++)
-               vpu->clocks[i].id = vpu->variant->clk_names[i];
-       ret = devm_clk_bulk_get(&pdev->dev, vpu->variant->num_clocks,
-                               vpu->clocks);
-       if (ret)
-               return ret;
-
-       res = platform_get_resource(vpu->pdev, IORESOURCE_MEM, 0);
-       vpu->base = devm_ioremap_resource(vpu->dev, res);
-       if (IS_ERR(vpu->base))
-               return PTR_ERR(vpu->base);
-       vpu->enc_base = vpu->base + vpu->variant->enc_offset;
-       vpu->dec_base = vpu->base + vpu->variant->dec_offset;
-
-       ret = dma_set_coherent_mask(vpu->dev, DMA_BIT_MASK(32));
-       if (ret) {
-               dev_err(vpu->dev, "Could not set DMA coherent mask.\n");
-               return ret;
-       }
-
-       if (vpu->variant->vdpu_irq) {
-               int irq;
-
-               irq = platform_get_irq_byname(vpu->pdev, "vdpu");
-               if (irq <= 0) {
-                       dev_err(vpu->dev, "Could not get vdpu IRQ.\n");
-                       return -ENXIO;
-               }
-
-               ret = devm_request_irq(vpu->dev, irq, vpu->variant->vdpu_irq,
-                                      0, dev_name(vpu->dev), vpu);
-               if (ret) {
-                       dev_err(vpu->dev, "Could not request vdpu IRQ.\n");
-                       return ret;
-               }
-       }
-
-       if (vpu->variant->vepu_irq) {
-               int irq;
-
-               irq = platform_get_irq_byname(vpu->pdev, "vepu");
-               if (irq <= 0) {
-                       dev_err(vpu->dev, "Could not get vepu IRQ.\n");
-                       return -ENXIO;
-               }
-
-               ret = devm_request_irq(vpu->dev, irq, vpu->variant->vepu_irq,
-                                      0, dev_name(vpu->dev), vpu);
-               if (ret) {
-                       dev_err(vpu->dev, "Could not request vepu IRQ.\n");
-                       return ret;
-               }
-       }
-
-       ret = vpu->variant->init(vpu);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to init VPU hardware\n");
-               return ret;
-       }
-
-       pm_runtime_set_autosuspend_delay(vpu->dev, 100);
-       pm_runtime_use_autosuspend(vpu->dev);
-       pm_runtime_enable(vpu->dev);
-
-       ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to prepare clocks\n");
-               return ret;
-       }
-
-       ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register v4l2 device\n");
-               goto err_clk_unprepare;
-       }
-       platform_set_drvdata(pdev, vpu);
-
-       vpu->m2m_dev = v4l2_m2m_init(&vpu_m2m_ops);
-       if (IS_ERR(vpu->m2m_dev)) {
-               v4l2_err(&vpu->v4l2_dev, "Failed to init mem2mem device\n");
-               ret = PTR_ERR(vpu->m2m_dev);
-               goto err_v4l2_unreg;
-       }
-
-       vpu->mdev.dev = vpu->dev;
-       strscpy(vpu->mdev.model, DRIVER_NAME, sizeof(vpu->mdev.model));
-       strscpy(vpu->mdev.bus_info, "platform: " DRIVER_NAME,
-               sizeof(vpu->mdev.model));
-       media_device_init(&vpu->mdev);
-       vpu->mdev.ops = &rockchip_m2m_media_ops;
-       vpu->v4l2_dev.mdev = &vpu->mdev;
-
-       ret = rockchip_vpu_add_enc_func(vpu);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register encoder\n");
-               goto err_m2m_rel;
-       }
-
-       ret = rockchip_vpu_add_dec_func(vpu);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register decoder\n");
-               goto err_rm_enc_func;
-       }
-
-       ret = media_device_register(&vpu->mdev);
-       if (ret) {
-               v4l2_err(&vpu->v4l2_dev, "Failed to register mem2mem media device\n");
-               goto err_rm_dec_func;
-       }
-
-       return 0;
-
-err_rm_dec_func:
-       rockchip_vpu_remove_dec_func(vpu);
-err_rm_enc_func:
-       rockchip_vpu_remove_enc_func(vpu);
-err_m2m_rel:
-       media_device_cleanup(&vpu->mdev);
-       v4l2_m2m_release(vpu->m2m_dev);
-err_v4l2_unreg:
-       v4l2_device_unregister(&vpu->v4l2_dev);
-err_clk_unprepare:
-       clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
-       pm_runtime_dont_use_autosuspend(vpu->dev);
-       pm_runtime_disable(vpu->dev);
-       return ret;
-}
-
-static int rockchip_vpu_remove(struct platform_device *pdev)
-{
-       struct rockchip_vpu_dev *vpu = platform_get_drvdata(pdev);
-
-       v4l2_info(&vpu->v4l2_dev, "Removing %s\n", pdev->name);
-
-       media_device_unregister(&vpu->mdev);
-       rockchip_vpu_remove_dec_func(vpu);
-       rockchip_vpu_remove_enc_func(vpu);
-       media_device_cleanup(&vpu->mdev);
-       v4l2_m2m_release(vpu->m2m_dev);
-       v4l2_device_unregister(&vpu->v4l2_dev);
-       clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
-       pm_runtime_dont_use_autosuspend(vpu->dev);
-       pm_runtime_disable(vpu->dev);
-       return 0;
-}
-
-static const struct dev_pm_ops rockchip_vpu_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-                               pm_runtime_force_resume)
-};
-
-static struct platform_driver rockchip_vpu_driver = {
-       .probe = rockchip_vpu_probe,
-       .remove = rockchip_vpu_remove,
-       .driver = {
-                  .name = DRIVER_NAME,
-                  .of_match_table = of_match_ptr(of_rockchip_vpu_match),
-                  .pm = &rockchip_vpu_pm_ops,
-       },
-};
-module_platform_driver(rockchip_vpu_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Alpha Lin <Alpha.Lin@Rock-Chips.com>");
-MODULE_AUTHOR("Tomasz Figa <tfiga@chromium.org>");
-MODULE_AUTHOR("Ezequiel Garcia <ezequiel@collabora.com>");
-MODULE_DESCRIPTION("Rockchip VPU codec driver");
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h b/drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h
deleted file mode 100644 (file)
index 6cecb52..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Rockchip VPU codec driver
- *
- * Copyright 2018 Google LLC.
- *     Tomasz Figa <tfiga@chromium.org>
- */
-
-#ifndef ROCKCHIP_VPU_HW_H_
-#define ROCKCHIP_VPU_HW_H_
-
-#include <linux/interrupt.h>
-#include <linux/v4l2-controls.h>
-#include <media/mpeg2-ctrls.h>
-#include <media/videobuf2-core.h>
-
-struct rockchip_vpu_dev;
-struct rockchip_vpu_ctx;
-struct rockchip_vpu_buf;
-struct rockchip_vpu_variant;
-
-/**
- * struct rockchip_vpu_aux_buf - auxiliary DMA buffer for hardware data
- * @cpu:       CPU pointer to the buffer.
- * @dma:       DMA address of the buffer.
- * @size:      Size of the buffer.
- */
-struct rockchip_vpu_aux_buf {
-       void *cpu;
-       dma_addr_t dma;
-       size_t size;
-};
-
-/**
- * struct rockchip_vpu_jpeg_enc_hw_ctx
- * @bounce_buffer:     Bounce buffer
- */
-struct rockchip_vpu_jpeg_enc_hw_ctx {
-       struct rockchip_vpu_aux_buf bounce_buffer;
-};
-
-/**
- * struct rockchip_vpu_mpeg2_dec_hw_ctx
- * @qtable:            Quantization table
- */
-struct rockchip_vpu_mpeg2_dec_hw_ctx {
-       struct rockchip_vpu_aux_buf qtable;
-};
-
-/**
- * struct rockchip_vpu_codec_ops - codec mode specific operations
- *
- * @init:      If needed, can be used for initialization.
- *             Optional and called from process context.
- * @exit:      If needed, can be used to undo the .init phase.
- *             Optional and called from process context.
- * @run:       Start single {en,de)coding job. Called from atomic context
- *             to indicate that a pair of buffers is ready and the hardware
- *             should be programmed and started.
- * @done:      Read back processing results and additional data from hardware.
- * @reset:     Reset the hardware in case of a timeout.
- */
-struct rockchip_vpu_codec_ops {
-       int (*init)(struct rockchip_vpu_ctx *ctx);
-       void (*exit)(struct rockchip_vpu_ctx *ctx);
-       void (*run)(struct rockchip_vpu_ctx *ctx);
-       void (*done)(struct rockchip_vpu_ctx *ctx, enum vb2_buffer_state);
-       void (*reset)(struct rockchip_vpu_ctx *ctx);
-};
-
-/**
- * enum rockchip_vpu_enc_fmt - source format ID for hardware registers.
- */
-enum rockchip_vpu_enc_fmt {
-       RK3288_VPU_ENC_FMT_YUV420P = 0,
-       RK3288_VPU_ENC_FMT_YUV420SP = 1,
-       RK3288_VPU_ENC_FMT_YUYV422 = 2,
-       RK3288_VPU_ENC_FMT_UYVY422 = 3,
-};
-
-extern const struct rockchip_vpu_variant rk3399_vpu_variant;
-extern const struct rockchip_vpu_variant rk3288_vpu_variant;
-
-void rockchip_vpu_watchdog(struct work_struct *work);
-void rockchip_vpu_run(struct rockchip_vpu_ctx *ctx);
-void rockchip_vpu_irq_done(struct rockchip_vpu_dev *vpu,
-                          unsigned int bytesused,
-                          enum vb2_buffer_state result);
-
-void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx);
-void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx);
-int rockchip_vpu_jpeg_enc_init(struct rockchip_vpu_ctx *ctx);
-void rockchip_vpu_jpeg_enc_exit(struct rockchip_vpu_ctx *ctx);
-
-void rk3288_vpu_mpeg2_dec_run(struct rockchip_vpu_ctx *ctx);
-void rk3399_vpu_mpeg2_dec_run(struct rockchip_vpu_ctx *ctx);
-void rockchip_vpu_mpeg2_dec_copy_qtable(u8 *qtable,
-       const struct v4l2_ctrl_mpeg2_quantization *ctrl);
-int rockchip_vpu_mpeg2_dec_init(struct rockchip_vpu_ctx *ctx);
-void rockchip_vpu_mpeg2_dec_exit(struct rockchip_vpu_ctx *ctx);
-
-#endif /* ROCKCHIP_VPU_HW_H_ */
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.c
deleted file mode 100644 (file)
index 30b97d2..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) Collabora, Ltd.
- *
- * Based on GSPCA and CODA drivers:
- * Copyright (C) Jean-Francois Moine (http://moinejf.free.fr)
- * Copyright (C) 2014 Philipp Zabel, Pengutronix
- */
-#include <linux/dma-mapping.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include "rockchip_vpu_jpeg.h"
-#include "rockchip_vpu.h"
-
-#define LUMA_QUANT_OFF         7
-#define CHROMA_QUANT_OFF       72
-#define HEIGHT_OFF             141
-#define WIDTH_OFF              143
-
-#define HUFF_LUMA_DC_OFF       160
-#define HUFF_LUMA_AC_OFF       193
-#define HUFF_CHROMA_DC_OFF     376
-#define HUFF_CHROMA_AC_OFF     409
-
-/* Default tables from JPEG ITU-T.81
- * (ISO/IEC 10918-1) Annex K.3, I
- */
-static const unsigned char luma_q_table[] = {
-       0x10, 0x0b, 0x0a, 0x10, 0x7c, 0x8c, 0x97, 0xa1,
-       0x0c, 0x0c, 0x0e, 0x13, 0x7e, 0x9e, 0xa0, 0x9b,
-       0x0e, 0x0d, 0x10, 0x18, 0x8c, 0x9d, 0xa9, 0x9c,
-       0x0e, 0x11, 0x16, 0x1d, 0x97, 0xbb, 0xb4, 0xa2,
-       0x12, 0x16, 0x25, 0x38, 0xa8, 0x6d, 0x67, 0xb1,
-       0x18, 0x23, 0x37, 0x40, 0xb5, 0x68, 0x71, 0xc0,
-       0x31, 0x40, 0x4e, 0x57, 0x67, 0x79, 0x78, 0x65,
-       0x48, 0x5c, 0x5f, 0x62, 0x70, 0x64, 0x67, 0xc7,
-};
-
-static const unsigned char chroma_q_table[] = {
-       0x11, 0x12, 0x18, 0x2f, 0x63, 0x63, 0x63, 0x63,
-       0x12, 0x15, 0x1a, 0x42, 0x63, 0x63, 0x63, 0x63,
-       0x18, 0x1a, 0x38, 0x63, 0x63, 0x63, 0x63, 0x63,
-       0x2f, 0x42, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-       0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63
-};
-
-/* Huffman tables are shared with CODA */
-static const unsigned char luma_dc_table[] = {
-       0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
-       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-       0x08, 0x09, 0x0a, 0x0b,
-};
-
-static const unsigned char chroma_dc_table[] = {
-       0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-       0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-       0x08, 0x09, 0x0a, 0x0b,
-};
-
-static const unsigned char luma_ac_table[] = {
-       0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
-       0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
-       0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
-       0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
-       0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
-       0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
-       0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
-       0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
-       0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-       0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
-       0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-       0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-       0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
-       0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-       0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
-       0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-       0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-       0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
-       0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
-       0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-       0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
-       0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-       0xf9, 0xfa,
-};
-
-static const unsigned char chroma_ac_table[] = {
-       0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
-       0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
-       0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
-       0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
-       0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
-       0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
-       0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
-       0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
-       0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
-       0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
-       0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-       0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-       0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
-       0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-       0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
-       0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
-       0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
-       0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
-       0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
-       0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-       0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
-       0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-       0xf9, 0xfa,
-};
-
-/* For simplicity, we keep a pre-formatted JPEG header,
- * and we'll use fixed offsets to change the width, height
- * quantization tables, etc.
- */
-static const unsigned char rockchip_vpu_jpeg_header[JPEG_HEADER_SIZE] = {
-       /* SOI */
-       0xff, 0xd8,
-
-       /* DQT */
-       0xff, 0xdb, 0x00, 0x84,
-
-       0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-       0x01,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-       /* SOF */
-       0xff, 0xc0, 0x00, 0x11, 0x08, 0x00, 0xf0, 0x01,
-       0x40, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01,
-       0x03, 0x11, 0x01,
-
-       /* DHT */
-       0xff, 0xc4, 0x00, 0x1f, 0x00,
-
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00,
-
-       /* DHT */
-       0xff, 0xc4, 0x00, 0xb5, 0x10,
-
-       0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-       /* DHT */
-       0xff, 0xc4, 0x00, 0x1f, 0x01,
-
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00,
-
-       /* DHT */
-       0xff, 0xc4, 0x00, 0xb5, 0x11,
-
-       0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
-       /* SOS */
-       0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02,
-       0x11, 0x03, 0x11, 0x00, 0x3f, 0x00,
-};
-
-static void
-jpeg_scale_quant_table(unsigned char *q_tab,
-                      const unsigned char *tab, int scale)
-{
-       unsigned int temp;
-       int i;
-
-       for (i = 0; i < 64; i++) {
-               temp = DIV_ROUND_CLOSEST((unsigned int)tab[i] * scale, 100);
-               if (temp <= 0)
-                       temp = 1;
-               if (temp > 255)
-                       temp = 255;
-               q_tab[i] = (unsigned char)temp;
-       }
-}
-
-static void jpeg_set_quality(unsigned char *buffer, int quality)
-{
-       int scale;
-
-       /*
-        * Non-linear scaling factor:
-        * [5,50] -> [1000..100], [51,100] -> [98..0]
-        */
-       if (quality < 50)
-               scale = 5000 / quality;
-       else
-               scale = 200 - 2 * quality;
-
-       jpeg_scale_quant_table(buffer + LUMA_QUANT_OFF,
-                              luma_q_table, scale);
-       jpeg_scale_quant_table(buffer + CHROMA_QUANT_OFF,
-                              chroma_q_table, scale);
-}
-
-unsigned char *
-rockchip_vpu_jpeg_get_qtable(struct rockchip_vpu_jpeg_ctx *ctx, int index)
-{
-       if (index == 0)
-               return ctx->buffer + LUMA_QUANT_OFF;
-       return ctx->buffer + CHROMA_QUANT_OFF;
-}
-
-void rockchip_vpu_jpeg_header_assemble(struct rockchip_vpu_jpeg_ctx *ctx)
-{
-       char *buf = ctx->buffer;
-
-       memcpy(buf, rockchip_vpu_jpeg_header,
-              sizeof(rockchip_vpu_jpeg_header));
-
-       buf[HEIGHT_OFF + 0] = ctx->height >> 8;
-       buf[HEIGHT_OFF + 1] = ctx->height;
-       buf[WIDTH_OFF + 0] = ctx->width >> 8;
-       buf[WIDTH_OFF + 1] = ctx->width;
-
-       memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, sizeof(luma_dc_table));
-       memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, sizeof(luma_ac_table));
-       memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table,
-              sizeof(chroma_dc_table));
-       memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table,
-              sizeof(chroma_ac_table));
-
-       jpeg_set_quality(buf, ctx->quality);
-}
-
-int rockchip_vpu_jpeg_enc_init(struct rockchip_vpu_ctx *ctx)
-{
-       ctx->jpeg_enc.bounce_buffer.size =
-               ctx->dst_fmt.plane_fmt[0].sizeimage -
-               ctx->vpu_dst_fmt->header_size;
-
-       ctx->jpeg_enc.bounce_buffer.cpu =
-               dma_alloc_attrs(ctx->dev->dev,
-                               ctx->jpeg_enc.bounce_buffer.size,
-                               &ctx->jpeg_enc.bounce_buffer.dma,
-                               GFP_KERNEL,
-                               DMA_ATTR_ALLOC_SINGLE_PAGES);
-       if (!ctx->jpeg_enc.bounce_buffer.cpu)
-               return -ENOMEM;
-
-       return 0;
-}
-
-void rockchip_vpu_jpeg_enc_exit(struct rockchip_vpu_ctx *ctx)
-{
-       dma_free_attrs(ctx->dev->dev,
-                      ctx->jpeg_enc.bounce_buffer.size,
-                      ctx->jpeg_enc.bounce_buffer.cpu,
-                      ctx->jpeg_enc.bounce_buffer.dma,
-                      DMA_ATTR_ALLOC_SINGLE_PAGES);
-}
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h b/drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h
deleted file mode 100644 (file)
index 72645d8..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-
-#define JPEG_HEADER_SIZE       601
-
-struct rockchip_vpu_jpeg_ctx {
-       int width;
-       int height;
-       int quality;
-       unsigned char *buffer;
-};
-
-unsigned char *
-rockchip_vpu_jpeg_get_qtable(struct rockchip_vpu_jpeg_ctx *ctx, int index);
-void rockchip_vpu_jpeg_header_assemble(struct rockchip_vpu_jpeg_ctx *ctx);
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c
deleted file mode 100644 (file)
index 5a5b9ea..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- */
-
-#include "rockchip_vpu.h"
-
-static const u8 zigzag[64] = {
-       0,   1,  8, 16,  9,  2,  3, 10,
-       17, 24, 32, 25, 18, 11,  4,  5,
-       12, 19, 26, 33, 40, 48, 41, 34,
-       27, 20, 13,  6,  7, 14, 21, 28,
-       35, 42, 49, 56, 57, 50, 43, 36,
-       29, 22, 15, 23, 30, 37, 44, 51,
-       58, 59, 52, 45, 38, 31, 39, 46,
-       53, 60, 61, 54, 47, 55, 62, 63
-};
-
-void rockchip_vpu_mpeg2_dec_copy_qtable(u8 *qtable,
-       const struct v4l2_ctrl_mpeg2_quantization *ctrl)
-{
-       int i, n;
-
-       if (!qtable || !ctrl)
-               return;
-
-       for (i = 0; i < ARRAY_SIZE(zigzag); i++) {
-               n = zigzag[i];
-               qtable[n + 0] = ctrl->intra_quantiser_matrix[i];
-               qtable[n + 64] = ctrl->non_intra_quantiser_matrix[i];
-               qtable[n + 128] = ctrl->chroma_intra_quantiser_matrix[i];
-               qtable[n + 192] = ctrl->chroma_non_intra_quantiser_matrix[i];
-       }
-}
-
-int rockchip_vpu_mpeg2_dec_init(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-
-       ctx->mpeg2_dec.qtable.size = ARRAY_SIZE(zigzag) * 4;
-       ctx->mpeg2_dec.qtable.cpu =
-               dma_alloc_coherent(vpu->dev,
-                                  ctx->mpeg2_dec.qtable.size,
-                                  &ctx->mpeg2_dec.qtable.dma,
-                                  GFP_KERNEL);
-       if (!ctx->mpeg2_dec.qtable.cpu)
-               return -ENOMEM;
-       return 0;
-}
-
-void rockchip_vpu_mpeg2_dec_exit(struct rockchip_vpu_ctx *ctx)
-{
-       struct rockchip_vpu_dev *vpu = ctx->dev;
-
-       dma_free_coherent(vpu->dev,
-                         ctx->mpeg2_dec.qtable.size,
-                         ctx->mpeg2_dec.qtable.cpu,
-                         ctx->mpeg2_dec.qtable.dma);
-}
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c
deleted file mode 100644 (file)
index 8bc709a..0000000
+++ /dev/null
@@ -1,692 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Collabora, Ltd.
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- *     Alpha Lin <Alpha.Lin@rock-chips.com>
- *     Jeffy Chen <jeffy.chen@rock-chips.com>
- *
- * Copyright 2018 Google LLC.
- *     Tomasz Figa <tfiga@chromium.org>
- *
- * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
- * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd.
- */
-
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/pm_runtime.h>
-#include <linux/videodev2.h>
-#include <linux/workqueue.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-event.h>
-#include <media/v4l2-mem2mem.h>
-#include <media/videobuf2-core.h>
-#include <media/videobuf2-dma-sg.h>
-
-#include "rockchip_vpu.h"
-#include "rockchip_vpu_hw.h"
-#include "rockchip_vpu_v4l2.h"
-
-static const struct rockchip_vpu_fmt *
-rockchip_vpu_get_formats(const struct rockchip_vpu_ctx *ctx,
-                        unsigned int *num_fmts)
-{
-       const struct rockchip_vpu_fmt *formats;
-
-       if (rockchip_vpu_is_encoder_ctx(ctx)) {
-               formats = ctx->dev->variant->enc_fmts;
-               *num_fmts = ctx->dev->variant->num_enc_fmts;
-       } else {
-               formats = ctx->dev->variant->dec_fmts;
-               *num_fmts = ctx->dev->variant->num_dec_fmts;
-       }
-
-       return formats;
-}
-
-static const struct rockchip_vpu_fmt *
-rockchip_vpu_find_format(const struct rockchip_vpu_fmt *formats,
-                        unsigned int num_fmts, u32 fourcc)
-{
-       unsigned int i;
-
-       for (i = 0; i < num_fmts; i++)
-               if (formats[i].fourcc == fourcc)
-                       return &formats[i];
-       return NULL;
-}
-
-static const struct rockchip_vpu_fmt *
-rockchip_vpu_get_default_fmt(const struct rockchip_vpu_fmt *formats,
-                            unsigned int num_fmts, bool bitstream)
-{
-       unsigned int i;
-
-       for (i = 0; i < num_fmts; i++) {
-               if (bitstream == (formats[i].codec_mode != RK_VPU_MODE_NONE))
-                       return &formats[i];
-       }
-       return NULL;
-}
-
-static int vidioc_querycap(struct file *file, void *priv,
-                          struct v4l2_capability *cap)
-{
-       struct rockchip_vpu_dev *vpu = video_drvdata(file);
-       struct video_device *vdev = video_devdata(file);
-
-       strscpy(cap->driver, vpu->dev->driver->name, sizeof(cap->driver));
-       strscpy(cap->card, vdev->name, sizeof(cap->card));
-       snprintf(cap->bus_info, sizeof(cap->bus_info), "platform: %s",
-                vpu->dev->driver->name);
-       return 0;
-}
-
-static int vidioc_enum_framesizes(struct file *file, void *priv,
-                                 struct v4l2_frmsizeenum *fsize)
-{
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-       const struct rockchip_vpu_fmt *formats, *fmt;
-       unsigned int num_fmts;
-
-       if (fsize->index != 0) {
-               vpu_debug(0, "invalid frame size index (expected 0, got %d)\n",
-                         fsize->index);
-               return -EINVAL;
-       }
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       fmt = rockchip_vpu_find_format(formats, num_fmts, fsize->pixel_format);
-       if (!fmt) {
-               vpu_debug(0, "unsupported bitstream format (%08x)\n",
-                         fsize->pixel_format);
-               return -EINVAL;
-       }
-
-       /* This only makes sense for coded formats */
-       if (fmt->codec_mode == RK_VPU_MODE_NONE)
-               return -EINVAL;
-
-       fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-       fsize->stepwise = fmt->frmsize;
-
-       return 0;
-}
-
-static int vidioc_enum_fmt(struct file *file, void *priv,
-                          struct v4l2_fmtdesc *f, bool capture)
-
-{
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-       const struct rockchip_vpu_fmt *fmt, *formats;
-       unsigned int num_fmts, i, j = 0;
-       bool skip_mode_none;
-
-       /*
-        * When dealing with an encoder:
-        *  - on the capture side we want to filter out all MODE_NONE formats.
-        *  - on the output side we want to filter out all formats that are
-        *    not MODE_NONE.
-        * When dealing with a decoder:
-        *  - on the capture side we want to filter out all formats that are
-        *    not MODE_NONE.
-        *  - on the output side we want to filter out all MODE_NONE formats.
-        */
-       skip_mode_none = capture == rockchip_vpu_is_encoder_ctx(ctx);
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       for (i = 0; i < num_fmts; i++) {
-               bool mode_none = formats[i].codec_mode == RK_VPU_MODE_NONE;
-
-               if (skip_mode_none == mode_none)
-                       continue;
-               if (j == f->index) {
-                       fmt = &formats[i];
-                       f->pixelformat = fmt->fourcc;
-                       return 0;
-               }
-               ++j;
-       }
-       return -EINVAL;
-}
-
-static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
-                                  struct v4l2_fmtdesc *f)
-{
-       return vidioc_enum_fmt(file, priv, f, true);
-}
-
-static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
-                                  struct v4l2_fmtdesc *f)
-{
-       return vidioc_enum_fmt(file, priv, f, false);
-}
-
-static int vidioc_g_fmt_out_mplane(struct file *file, void *priv,
-                                  struct v4l2_format *f)
-{
-       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-
-       vpu_debug(4, "f->type = %d\n", f->type);
-
-       *pix_mp = ctx->src_fmt;
-
-       return 0;
-}
-
-static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
-                                  struct v4l2_format *f)
-{
-       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-
-       vpu_debug(4, "f->type = %d\n", f->type);
-
-       *pix_mp = ctx->dst_fmt;
-
-       return 0;
-}
-
-static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f,
-                         bool capture)
-{
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-       const struct rockchip_vpu_fmt *formats, *fmt, *vpu_fmt;
-       unsigned int num_fmts;
-       bool coded;
-
-       coded = capture == rockchip_vpu_is_encoder_ctx(ctx);
-
-       vpu_debug(4, "trying format %c%c%c%c\n",
-                 (pix_mp->pixelformat & 0x7f),
-                 (pix_mp->pixelformat >> 8) & 0x7f,
-                 (pix_mp->pixelformat >> 16) & 0x7f,
-                 (pix_mp->pixelformat >> 24) & 0x7f);
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       fmt = rockchip_vpu_find_format(formats, num_fmts, pix_mp->pixelformat);
-       if (!fmt) {
-               fmt = rockchip_vpu_get_default_fmt(formats, num_fmts, coded);
-               f->fmt.pix_mp.pixelformat = fmt->fourcc;
-       }
-
-       if (coded) {
-               pix_mp->num_planes = 1;
-               vpu_fmt = fmt;
-       } else if (rockchip_vpu_is_encoder_ctx(ctx)) {
-               vpu_fmt = ctx->vpu_dst_fmt;
-       } else {
-               vpu_fmt = ctx->vpu_src_fmt;
-               /*
-                * Width/height on the CAPTURE end of a decoder are ignored and
-                * replaced by the OUTPUT ones.
-                */
-               pix_mp->width = ctx->src_fmt.width;
-               pix_mp->height = ctx->src_fmt.height;
-       }
-
-       pix_mp->field = V4L2_FIELD_NONE;
-
-       v4l2_apply_frmsize_constraints(&pix_mp->width, &pix_mp->height,
-                                      &vpu_fmt->frmsize);
-
-       if (!coded) {
-               /* Fill remaining fields */
-               v4l2_fill_pixfmt_mp(pix_mp, fmt->fourcc, pix_mp->width,
-                                   pix_mp->height);
-       } else if (!pix_mp->plane_fmt[0].sizeimage) {
-               /*
-                * For coded formats the application can specify
-                * sizeimage. If the application passes a zero sizeimage,
-                * let's default to the maximum frame size.
-                */
-               pix_mp->plane_fmt[0].sizeimage = fmt->header_size +
-                       pix_mp->width * pix_mp->height * fmt->max_depth;
-       }
-
-       return 0;
-}
-
-static int vidioc_try_fmt_cap_mplane(struct file *file, void *priv,
-                                    struct v4l2_format *f)
-{
-       return vidioc_try_fmt(file, priv, f, true);
-}
-
-static int vidioc_try_fmt_out_mplane(struct file *file, void *priv,
-                                    struct v4l2_format *f)
-{
-       return vidioc_try_fmt(file, priv, f, false);
-}
-
-static void
-rockchip_vpu_reset_fmt(struct v4l2_pix_format_mplane *fmt,
-                      const struct rockchip_vpu_fmt *vpu_fmt)
-{
-       memset(fmt, 0, sizeof(*fmt));
-
-       fmt->pixelformat = vpu_fmt->fourcc;
-       fmt->field = V4L2_FIELD_NONE;
-       fmt->colorspace = V4L2_COLORSPACE_JPEG,
-       fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
-       fmt->quantization = V4L2_QUANTIZATION_DEFAULT;
-       fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;
-}
-
-static void
-rockchip_vpu_reset_encoded_fmt(struct rockchip_vpu_ctx *ctx)
-{
-       const struct rockchip_vpu_fmt *vpu_fmt, *formats;
-       struct v4l2_pix_format_mplane *fmt;
-       unsigned int num_fmts;
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       vpu_fmt = rockchip_vpu_get_default_fmt(formats, num_fmts, true);
-
-       if (rockchip_vpu_is_encoder_ctx(ctx)) {
-               ctx->vpu_dst_fmt = vpu_fmt;
-               fmt = &ctx->dst_fmt;
-       } else {
-               ctx->vpu_src_fmt = vpu_fmt;
-               fmt = &ctx->src_fmt;
-       }
-
-       rockchip_vpu_reset_fmt(fmt, vpu_fmt);
-       fmt->num_planes = 1;
-       fmt->width = vpu_fmt->frmsize.min_width;
-       fmt->height = vpu_fmt->frmsize.min_height;
-       fmt->plane_fmt[0].sizeimage = vpu_fmt->header_size +
-                               fmt->width * fmt->height * vpu_fmt->max_depth;
-}
-
-static void
-rockchip_vpu_reset_raw_fmt(struct rockchip_vpu_ctx *ctx)
-{
-       const struct rockchip_vpu_fmt *raw_vpu_fmt, *formats;
-       struct v4l2_pix_format_mplane *raw_fmt, *encoded_fmt;
-       unsigned int num_fmts;
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       raw_vpu_fmt = rockchip_vpu_get_default_fmt(formats, num_fmts, false);
-
-       if (rockchip_vpu_is_encoder_ctx(ctx)) {
-               ctx->vpu_src_fmt = raw_vpu_fmt;
-               raw_fmt = &ctx->src_fmt;
-               encoded_fmt = &ctx->dst_fmt;
-       } else {
-               ctx->vpu_dst_fmt = raw_vpu_fmt;
-               raw_fmt = &ctx->dst_fmt;
-               encoded_fmt = &ctx->src_fmt;
-       }
-
-       rockchip_vpu_reset_fmt(raw_fmt, raw_vpu_fmt);
-       v4l2_fill_pixfmt_mp(raw_fmt, raw_vpu_fmt->fourcc,
-                           encoded_fmt->width,
-                           encoded_fmt->height);
-}
-
-void rockchip_vpu_reset_fmts(struct rockchip_vpu_ctx *ctx)
-{
-       rockchip_vpu_reset_encoded_fmt(ctx);
-       rockchip_vpu_reset_raw_fmt(ctx);
-}
-
-static void
-rockchip_vpu_update_requires_request(struct rockchip_vpu_ctx *ctx,
-                                    u32 fourcc)
-{
-       switch (fourcc) {
-       case V4L2_PIX_FMT_JPEG:
-               ctx->fh.m2m_ctx->out_q_ctx.q.requires_requests = false;
-               break;
-       case V4L2_PIX_FMT_MPEG2_SLICE:
-               ctx->fh.m2m_ctx->out_q_ctx.q.requires_requests = true;
-               break;
-       default:
-               break;
-       }
-}
-
-static int
-vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f)
-{
-       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-       const struct rockchip_vpu_fmt *formats;
-       unsigned int num_fmts;
-       struct vb2_queue *vq;
-       int ret;
-
-       /* Change not allowed if queue is busy. */
-       vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-       if (vb2_is_busy(vq))
-               return -EBUSY;
-
-       if (!rockchip_vpu_is_encoder_ctx(ctx)) {
-               struct vb2_queue *peer_vq;
-
-               /*
-                * Since format change on the OUTPUT queue will reset
-                * the CAPTURE queue, we can't allow doing so
-                * when the CAPTURE queue has buffers allocated.
-                */
-               peer_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
-                                         V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-               if (vb2_is_busy(peer_vq))
-                       return -EBUSY;
-       }
-
-       ret = vidioc_try_fmt_out_mplane(file, priv, f);
-       if (ret)
-               return ret;
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       ctx->vpu_src_fmt = rockchip_vpu_find_format(formats, num_fmts,
-                                                   pix_mp->pixelformat);
-       ctx->src_fmt = *pix_mp;
-
-       /*
-        * Current raw format might have become invalid with newly
-        * selected codec, so reset it to default just to be safe and
-        * keep internal driver state sane. User is mandated to set
-        * the raw format again after we return, so we don't need
-        * anything smarter.
-        * Note that rockchip_vpu_reset_raw_fmt() also propagates size
-        * changes to the raw format.
-        */
-       if (!rockchip_vpu_is_encoder_ctx(ctx))
-               rockchip_vpu_reset_raw_fmt(ctx);
-
-       /* Colorimetry information are always propagated. */
-       ctx->dst_fmt.colorspace = pix_mp->colorspace;
-       ctx->dst_fmt.ycbcr_enc = pix_mp->ycbcr_enc;
-       ctx->dst_fmt.xfer_func = pix_mp->xfer_func;
-       ctx->dst_fmt.quantization = pix_mp->quantization;
-
-       rockchip_vpu_update_requires_request(ctx, pix_mp->pixelformat);
-
-       vpu_debug(0, "OUTPUT codec mode: %d\n", ctx->vpu_src_fmt->codec_mode);
-       vpu_debug(0, "fmt - w: %d, h: %d\n",
-                 pix_mp->width, pix_mp->height);
-       return 0;
-}
-
-static int vidioc_s_fmt_cap_mplane(struct file *file, void *priv,
-                                  struct v4l2_format *f)
-{
-       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-       struct rockchip_vpu_ctx *ctx = fh_to_ctx(priv);
-       const struct rockchip_vpu_fmt *formats;
-       struct vb2_queue *vq;
-       unsigned int num_fmts;
-       int ret;
-
-       /* Change not allowed if queue is busy. */
-       vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-       if (vb2_is_busy(vq))
-               return -EBUSY;
-
-       if (rockchip_vpu_is_encoder_ctx(ctx)) {
-               struct vb2_queue *peer_vq;
-
-               /*
-                * Since format change on the CAPTURE queue will reset
-                * the OUTPUT queue, we can't allow doing so
-                * when the OUTPUT queue has buffers allocated.
-                */
-               peer_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
-                                         V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
-               if (vb2_is_busy(peer_vq) &&
-                   (pix_mp->pixelformat != ctx->dst_fmt.pixelformat ||
-                    pix_mp->height != ctx->dst_fmt.height ||
-                    pix_mp->width != ctx->dst_fmt.width))
-                       return -EBUSY;
-       }
-
-       ret = vidioc_try_fmt_cap_mplane(file, priv, f);
-       if (ret)
-               return ret;
-
-       formats = rockchip_vpu_get_formats(ctx, &num_fmts);
-       ctx->vpu_dst_fmt = rockchip_vpu_find_format(formats, num_fmts,
-                                                   pix_mp->pixelformat);
-       ctx->dst_fmt = *pix_mp;
-
-       /*
-        * Current raw format might have become invalid with newly
-        * selected codec, so reset it to default just to be safe and
-        * keep internal driver state sane. User is mandated to set
-        * the raw format again after we return, so we don't need
-        * anything smarter.
-        * Note that rockchip_vpu_reset_raw_fmt() also propagates size
-        * changes to the raw format.
-        */
-       if (rockchip_vpu_is_encoder_ctx(ctx))
-               rockchip_vpu_reset_raw_fmt(ctx);
-
-       /* Colorimetry information are always propagated. */
-       ctx->src_fmt.colorspace = pix_mp->colorspace;
-       ctx->src_fmt.ycbcr_enc = pix_mp->ycbcr_enc;
-       ctx->src_fmt.xfer_func = pix_mp->xfer_func;
-       ctx->src_fmt.quantization = pix_mp->quantization;
-
-       vpu_debug(0, "CAPTURE codec mode: %d\n", ctx->vpu_dst_fmt->codec_mode);
-       vpu_debug(0, "fmt - w: %d, h: %d\n",
-                 pix_mp->width, pix_mp->height);
-
-       rockchip_vpu_update_requires_request(ctx, pix_mp->pixelformat);
-
-       return 0;
-}
-
-const struct v4l2_ioctl_ops rockchip_vpu_ioctl_ops = {
-       .vidioc_querycap = vidioc_querycap,
-       .vidioc_enum_framesizes = vidioc_enum_framesizes,
-
-       .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_cap_mplane,
-       .vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_out_mplane,
-       .vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_out_mplane,
-       .vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_cap_mplane,
-       .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_out_mplane,
-       .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_cap_mplane,
-       .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
-       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
-
-       .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
-       .vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
-       .vidioc_qbuf = v4l2_m2m_ioctl_qbuf,
-       .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf,
-       .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
-       .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
-       .vidioc_expbuf = v4l2_m2m_ioctl_expbuf,
-
-       .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
-       .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
-
-       .vidioc_streamon = v4l2_m2m_ioctl_streamon,
-       .vidioc_streamoff = v4l2_m2m_ioctl_streamoff,
-};
-
-static int
-rockchip_vpu_queue_setup(struct vb2_queue *vq,
-                        unsigned int *num_buffers,
-                        unsigned int *num_planes,
-                        unsigned int sizes[],
-                        struct device *alloc_devs[])
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(vq);
-       struct v4l2_pix_format_mplane *pixfmt;
-       int i;
-
-       switch (vq->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
-               pixfmt = &ctx->dst_fmt;
-               break;
-       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-               pixfmt = &ctx->src_fmt;
-               break;
-       default:
-               vpu_err("invalid queue type: %d\n", vq->type);
-               return -EINVAL;
-       }
-
-       if (*num_planes) {
-               if (*num_planes != pixfmt->num_planes)
-                       return -EINVAL;
-               for (i = 0; i < pixfmt->num_planes; ++i)
-                       if (sizes[i] < pixfmt->plane_fmt[i].sizeimage)
-                               return -EINVAL;
-               return 0;
-       }
-
-       *num_planes = pixfmt->num_planes;
-       for (i = 0; i < pixfmt->num_planes; ++i)
-               sizes[i] = pixfmt->plane_fmt[i].sizeimage;
-       return 0;
-}
-
-static int
-rockchip_vpu_buf_plane_check(struct vb2_buffer *vb,
-                            const struct rockchip_vpu_fmt *vpu_fmt,
-                            struct v4l2_pix_format_mplane *pixfmt)
-{
-       unsigned int sz;
-       int i;
-
-       for (i = 0; i < pixfmt->num_planes; ++i) {
-               sz = pixfmt->plane_fmt[i].sizeimage;
-               vpu_debug(4, "plane %d size: %ld, sizeimage: %u\n",
-                         i, vb2_plane_size(vb, i), sz);
-               if (vb2_plane_size(vb, i) < sz) {
-                       vpu_err("plane %d is too small for output\n", i);
-                       return -EINVAL;
-               }
-       }
-       return 0;
-}
-
-static int rockchip_vpu_buf_prepare(struct vb2_buffer *vb)
-{
-       struct vb2_queue *vq = vb->vb2_queue;
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(vq);
-
-       if (V4L2_TYPE_IS_OUTPUT(vq->type))
-               return rockchip_vpu_buf_plane_check(vb, ctx->vpu_src_fmt,
-                                                   &ctx->src_fmt);
-
-       return rockchip_vpu_buf_plane_check(vb, ctx->vpu_dst_fmt,
-                                           &ctx->dst_fmt);
-}
-
-static void rockchip_vpu_buf_queue(struct vb2_buffer *vb)
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-
-       v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
-}
-
-static bool rockchip_vpu_vq_is_coded(struct vb2_queue *q)
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(q);
-
-       return rockchip_vpu_is_encoder_ctx(ctx) != V4L2_TYPE_IS_OUTPUT(q->type);
-}
-
-static int rockchip_vpu_start_streaming(struct vb2_queue *q,
-                                       unsigned int count)
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(q);
-       int ret = 0;
-
-       if (V4L2_TYPE_IS_OUTPUT(q->type))
-               ctx->sequence_out = 0;
-       else
-               ctx->sequence_cap = 0;
-
-       if (rockchip_vpu_vq_is_coded(q)) {
-               enum rockchip_vpu_codec_mode codec_mode;
-
-               if (V4L2_TYPE_IS_OUTPUT(q->type))
-                       codec_mode = ctx->vpu_src_fmt->codec_mode;
-               else
-                       codec_mode = ctx->vpu_dst_fmt->codec_mode;
-
-               vpu_debug(4, "Codec mode = %d\n", codec_mode);
-               ctx->codec_ops = &ctx->dev->variant->codec_ops[codec_mode];
-               if (ctx->codec_ops && ctx->codec_ops->init)
-                       ret = ctx->codec_ops->init(ctx);
-       }
-
-       return ret;
-}
-
-static void
-rockchip_vpu_return_bufs(struct vb2_queue *q,
-                        struct vb2_v4l2_buffer *(*buf_remove)(struct v4l2_m2m_ctx *))
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(q);
-
-       for (;;) {
-               struct vb2_v4l2_buffer *vbuf;
-
-               vbuf = buf_remove(ctx->fh.m2m_ctx);
-               if (!vbuf)
-                       break;
-               v4l2_ctrl_request_complete(vbuf->vb2_buf.req_obj.req,
-                                          &ctx->ctrl_handler);
-               v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
-       }
-}
-
-static void rockchip_vpu_stop_streaming(struct vb2_queue *q)
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(q);
-
-       if (rockchip_vpu_vq_is_coded(q)) {
-               if (ctx->codec_ops && ctx->codec_ops->exit)
-                       ctx->codec_ops->exit(ctx);
-       }
-
-       /*
-        * The mem2mem framework calls v4l2_m2m_cancel_job before
-        * .stop_streaming, so there isn't any job running and
-        * it is safe to return all the buffers.
-        */
-       if (V4L2_TYPE_IS_OUTPUT(q->type))
-               rockchip_vpu_return_bufs(q, v4l2_m2m_src_buf_remove);
-       else
-               rockchip_vpu_return_bufs(q, v4l2_m2m_dst_buf_remove);
-}
-
-static void rockchip_vpu_buf_request_complete(struct vb2_buffer *vb)
-{
-       struct rockchip_vpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-
-       v4l2_ctrl_request_complete(vb->req_obj.req, &ctx->ctrl_handler);
-}
-
-static int rockchip_vpu_buf_out_validate(struct vb2_buffer *vb)
-{
-       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-
-       vbuf->field = V4L2_FIELD_NONE;
-       return 0;
-}
-
-const struct vb2_ops rockchip_vpu_queue_ops = {
-       .queue_setup = rockchip_vpu_queue_setup,
-       .buf_prepare = rockchip_vpu_buf_prepare,
-       .buf_queue = rockchip_vpu_buf_queue,
-       .buf_out_validate = rockchip_vpu_buf_out_validate,
-       .buf_request_complete = rockchip_vpu_buf_request_complete,
-       .start_streaming = rockchip_vpu_start_streaming,
-       .stop_streaming = rockchip_vpu_stop_streaming,
-       .wait_prepare = vb2_ops_wait_prepare,
-       .wait_finish = vb2_ops_wait_finish,
-};
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.h b/drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.h
deleted file mode 100644 (file)
index 493e875..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Rockchip VPU codec driver
- *
- * Copyright (C) 2018 Rockchip Electronics Co., Ltd.
- *     Alpha Lin <Alpha.Lin@rock-chips.com>
- *     Jeffy Chen <jeffy.chen@rock-chips.com>
- *
- * Copyright 2018 Google LLC.
- *     Tomasz Figa <tfiga@chromium.org>
- *
- * Based on s5p-mfc driver by Samsung Electronics Co., Ltd.
- * Copyright (C) 2011 Samsung Electronics Co., Ltd.
- */
-
-#ifndef ROCKCHIP_VPU_V4L2_H_
-#define ROCKCHIP_VPU_V4L2_H_
-
-#include "rockchip_vpu.h"
-
-extern const struct v4l2_ioctl_ops rockchip_vpu_ioctl_ops;
-extern const struct vb2_ops rockchip_vpu_queue_ops;
-
-void rockchip_vpu_reset_fmts(struct rockchip_vpu_ctx *ctx);
-
-#endif /* ROCKCHIP_VPU_V4L2_H_ */