Re: [PATCH v3 1/8] dt-bindings: Add a binding for Mediatek Video Processor
Hi Rob, Got it. Sorry about that. I will add acks next time. best regards, Tiffany On Mon, 2016-01-04 at 08:15 -0600, Rob Herring wrote: > On Mon, Jan 04, 2016 at 06:11:49PM +0800, Tiffany Lin wrote: > > From: Andrew-CT Chen > > > > Add a DT binding documentation of Video Processor Unit for the > > MT8173 SoC from Mediatek. > > > > Signed-off-by: Andrew-CT Chen > > Signed-off-by: Tiffany Lin > > Please add acks when sending new versions as I already acked the last > version. > > Acked-by: Rob Herring -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3 8/8] arm64: dts: mediatek: Add Video Encoder for MT8173
Add video encoder node for MT8173
Signed-off-by: Tiffany Lin
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 37 ++
1 file changed, 37 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index b3636cd..09f29c5 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -1138,6 +1138,43 @@
clock-names = "apb", "smi";
};
+ vcodec_enc: vcodec@18002000 {
+ compatible = "mediatek,mt8173-vcodec-enc";
+ reg = <0 0x18002000 0 0x1000>, /* VENC_SYS */
+ <0 0x19002000 0 0x1000>; /* VENC_LT_SYS */
+ interrupts = ,
+;
+ mediatek,larb = <&larb3>,
+ <&larb5>;
+ iommus = <&iommu M4U_PORT_VENC_RCPU>,
+<&iommu M4U_PORT_VENC_REC>,
+<&iommu M4U_PORT_VENC_BSDMA>,
+<&iommu M4U_PORT_VENC_SV_COMV>,
+<&iommu M4U_PORT_VENC_RD_COMV>,
+<&iommu M4U_PORT_VENC_CUR_LUMA>,
+<&iommu M4U_PORT_VENC_CUR_CHROMA>,
+<&iommu M4U_PORT_VENC_REF_LUMA>,
+<&iommu M4U_PORT_VENC_REF_CHROMA>,
+<&iommu M4U_PORT_VENC_NBM_RDMA>,
+<&iommu M4U_PORT_VENC_NBM_WDMA>,
+<&iommu M4U_PORT_VENC_RCPU_SET2>,
+<&iommu M4U_PORT_VENC_REC_FRM_SET2>,
+<&iommu M4U_PORT_VENC_BSDMA_SET2>,
+<&iommu M4U_PORT_VENC_SV_COMA_SET2>,
+<&iommu M4U_PORT_VENC_RD_COMA_SET2>,
+<&iommu M4U_PORT_VENC_CUR_LUMA_SET2>,
+<&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>,
+<&iommu M4U_PORT_VENC_REF_LUMA_SET2>,
+<&iommu M4U_PORT_VENC_REC_CHROMA_SET2>;
+ mediatek,vpu = <&vpu>;
+ clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
+<&topckgen CLK_TOP_VENC_LT_SEL>,
+<&topckgen CLK_TOP_VCODECPLL_370P5>;
+ clock-names = "vencpll",
+ "venc_lt_sel",
+ "vcodecpll_370p5_ck";
+ };
+
vencltsys: clock-controller@1900 {
compatible = "mediatek,mt8173-vencltsys", "syscon";
reg = <0 0x1900 0 0x1000>;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3 3/8] arm64: dts: mediatek: Add node for Mediatek Video Processor Unit
Add VPU drivers for MT8173
Signed-off-by: Andrew-CT Chen
Signed-off-by: Tiffany Lin
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 11 +++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 60a1284..b3636cd 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -422,6 +422,17 @@
clocks = <&infracfg CLK_INFRA_CEC>;
};
+ vpu: vpu@1002 {
+ compatible = "mediatek,mt8173-vpu";
+ reg = <0 0x1002 0 0x3>,
+ <0 0x1005 0 0x100>;
+ reg-names = "tcm", "cfg_reg";
+ interrupts = ;
+ clocks = <&topckgen CLK_TOP_SCP_SEL>;
+ clock-names = "main";
+ iommus = <&iommu M4U_PORT_VENC_RCPU>;
+ };
+
sysirq: intpol-controller@10200620 {
compatible = "mediatek,mt8173-sysirq",
"mediatek,mt6577-sysirq";
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3 6/8] media: vcodec: mediatek: Add Mediatek VP8 Video Encoder Driver
Add vp8 encoder driver for MT8173
Signed-off-by: Daniel Hsiao
Signed-off-by: Tiffany Lin
---
drivers/media/platform/mtk-vcodec/Makefile |2 +
drivers/media/platform/mtk-vcodec/venc_drv_if.c|3 +
drivers/media/platform/mtk-vcodec/vp8_enc/Makefile |6 +
.../platform/mtk-vcodec/vp8_enc/venc_vp8_if.c | 419
.../platform/mtk-vcodec/vp8_enc/venc_vp8_if.h | 145 +++
.../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c | 221 +++
.../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.h | 28 ++
7 files changed, 824 insertions(+)
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.h
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.h
diff --git a/drivers/media/platform/mtk-vcodec/Makefile
b/drivers/media/platform/mtk-vcodec/Makefile
index ce38689..f4ef502 100644
--- a/drivers/media/platform/mtk-vcodec/Makefile
+++ b/drivers/media/platform/mtk-vcodec/Makefile
@@ -5,4 +5,6 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
mtk_vcodec_enc_pm.o \
venc_drv_if.o
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/
+
ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c
b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
index daa8e93..d293f2c 100644
--- a/drivers/media/platform/mtk-vcodec/venc_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
@@ -24,6 +24,7 @@
#include "mtk_vpu.h"
#include "venc_drv_base.h"
+#include "vp8_enc/venc_vp8_if.h"
int venc_if_create(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
{
@@ -34,6 +35,8 @@ int venc_if_create(struct mtk_vcodec_ctx *ctx, unsigned int
fourcc)
switch (fourcc) {
case V4L2_PIX_FMT_VP8:
+ctx->enc_if = get_vp8_enc_comm_if();
+break;
case V4L2_PIX_FMT_H264:
default:
return -EINVAL;
diff --git a/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
b/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
new file mode 100644
index 000..0f515c7
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_vp8_if.o venc_vp8_vpu.o
+
+ccflags-y += \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/vp8_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
b/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
new file mode 100644
index 000..dbd88a8
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
@@ -0,0 +1,419 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Daniel Hsiao
+ * PoChun Lin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+#include
+
+#include "mtk_vcodec_drv.h"
+#include "mtk_vcodec_util.h"
+#include "mtk_vcodec_intr.h"
+#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_pm.h"
+#include "mtk_vpu.h"
+
+#include "venc_vp8_if.h"
+#include "venc_vp8_vpu.h"
+
+#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
+#define VENC_PIC_BITSTREAM_BYTE_CNT1 0x00e8
+#define VENC_IRQ_STATUS_ENC_FRM_INT 0x04
+
+#define MAX_AC_TAG_SZ 10
+
+static inline void vp8_enc_write_reg(struct venc_vp8_inst *inst, u32 addr,
+u32 val)
+{
+ writel(val, inst->hw_base + addr);
+}
+
+static inline u32 vp8_enc_read_reg(struct venc_vp8_inst *inst, u32 addr)
+{
+ return readl(inst->hw_base + addr);
+}
+
+static void vp8_enc_free_work_buf(struct venc_vp8_inst *inst)
+{
+ int i;
+
+ mtk_vcodec_debug_enter(inst);
+
+ /* Except the RC_CODEx buffers, other buffers need to be freed by AP. */
+ for (i = 0; i < VENC_VP8_VPU_WORK_BUF_MAX; i++)
+ if ((i != VENC_VP8_VPU_WORK_BUF_RC_CODE) &&
+ (i != VENC_VP8_VPU_WORK_BUF_RC_CODE2) &&
+ (i != VENC_VP8_VPU_WORK_BUF_RC_CODE3))
+ if (inst->work_bufs[i].va != NULL)
+ mtk_vcodec_mem_free(
[PATCH v3 2/8] media: VPU: mediatek: support Mediatek VPU
The VPU driver for hw video codec embedded in Mediatek's MT8173 SOCs. It is able to handle video decoding/encoding of in a range of formats. The driver provides with VPU firmware download, memory management and the communication interface between CPU and VPU. For VPU initialization, it will create virtual memory for CPU access and IOMMU address for vcodec hw device access. When a decode/encode instance opens a device node, vpu driver will download vpu firmware to the device. A decode/encode instant will decode/encode a frame using VPU interface to interrupt vpu to handle decoding/encoding jobs. Signed-off-by: Andrew-CT Chen Signed-off-by: Tiffany Lin --- drivers/media/platform/Kconfig |9 + drivers/media/platform/Makefile |2 + drivers/media/platform/mtk-vpu/Makefile |1 + drivers/media/platform/mtk-vpu/mtk_vpu.c | 941 ++ drivers/media/platform/mtk-vpu/mtk_vpu.h | 182 ++ 5 files changed, 1135 insertions(+) create mode 100644 drivers/media/platform/mtk-vpu/Makefile create mode 100644 drivers/media/platform/mtk-vpu/mtk_vpu.c create mode 100644 drivers/media/platform/mtk-vpu/mtk_vpu.h diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ccbc974..ba812d6 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -148,6 +148,15 @@ config VIDEO_CODA Coda is a range of video codec IPs that supports H.264, MPEG-4, and other video formats. +config VIDEO_MEDIATEK_VPU + tristate "Mediatek Video Processor Unit" + depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MEDIATEK + ---help--- + This driver provides downloading VPU firmware and + communicating with VPU. This driver for hw video + codec embedded in new Mediatek's SOCs. It is able + to handle video decoding/encoding in a range of formats. + config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index efa0295..e5b19c6 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -55,3 +55,5 @@ obj-$(CONFIG_VIDEO_AM437X_VPFE) += am437x/ obj-$(CONFIG_VIDEO_XILINX) += xilinx/ ccflags-y += -I$(srctree)/drivers/media/i2c + +obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mtk-vpu/Makefile new file mode 100644 index 000..d890a66 --- /dev/null +++ b/drivers/media/platform/mtk-vpu/Makefile @@ -0,0 +1 @@ +obj-y += mtk_vpu.o diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c new file mode 100644 index 000..be4c43e --- /dev/null +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c @@ -0,0 +1,941 @@ +/* +* Copyright (c) 2015 MediaTek Inc. +* Author: Andrew-CT Chen +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mtk_vpu.h" + +/** + * VPU (video processor unit) is a tiny processor controlling video hardware + * related to video codec, scaling and color format converting. + * VPU interfaces with other blocks by share memory and interrupt. + **/ + +#define INIT_TIMEOUT_MS2000U +#define IPI_TIMEOUT_MS 2000U +#define VPU_FW_VER_LEN 16 + +/* maximum program/data TCM (Tightly-Coupled Memory) size */ +#define VPU_PTCM_SIZE (96 * SZ_1K) +#define VPU_DTCM_SIZE (32 * SZ_1K) +/* the offset to get data tcm address */ +#define VPU_DTCM_OFFSET0x18000UL +/* daynamic allocated maximum extended memory size */ +#define VPU_EXT_P_SIZE SZ_1M +#define VPU_EXT_D_SIZE SZ_4M +/* maximum binary firmware size */ +#define VPU_P_FW_SIZE (VPU_PTCM_SIZE + VPU_EXT_P_SIZE) +#define VPU_D_FW_SIZE (VPU_DTCM_SIZE + VPU_EXT_D_SIZE) +/* the size of share buffer between Host and VPU */ +#define SHARE_BUF_SIZE 48 + +/* binary firmware name */ +#define VPU_P_FW "vpu_p.bin" +#define VPU_D_FW "vpu_d.bin" + +#define VPU_RESET 0x0 +#define VPU_TCM_CFG0x0008 +#define VPU_PMEM_EXT0_ADDR 0x000C +#define VPU_PMEM_EXT1_ADDR 0x0010 +#define VPU_TO_HOST0x001C +#define VPU_DMEM_EXT0_ADDR 0x0014 +#def
[PATCH v3 1/8] dt-bindings: Add a binding for Mediatek Video Processor
From: Andrew-CT Chen
Add a DT binding documentation of Video Processor Unit for the
MT8173 SoC from Mediatek.
Signed-off-by: Andrew-CT Chen
Signed-off-by: Tiffany Lin
---
.../devicetree/bindings/media/mediatek-vpu.txt | 27
1 file changed, 27 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-vpu.txt
diff --git a/Documentation/devicetree/bindings/media/mediatek-vpu.txt
b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
new file mode 100644
index 000..3c3a424
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
@@ -0,0 +1,27 @@
+* Mediatek Video Processor Unit
+
+Video Processor Unit is a HW video controller. It controls HW Codec including
+H.264/VP8/VP9 Decode, H.264/VP8 Encode and Image Processor (scale/rotate/color
convert).
+
+Required properties:
+ - compatible: "mediatek,mt8173-vpu"
+ - reg: Must contain an entry for each entry in reg-names.
+ - reg-names: Must include the following entries:
+"tcm": tcm base
+"cfg_reg": Main configuration registers base
+ - interrupts: interrupt number to the cpu.
+ - clocks : clock name from clock manager
+ - clock-names: must be main. It is the main clock of VPU
+ - iommus : phandle and IOMMU spcifier for the IOMMU that serves the VPU.
+
+Example:
+ vpu: vpu@1002 {
+ compatible = "mediatek,mt8173-vpu";
+ reg = <0 0x1002 0 0x3>,
+ <0 0x1005 0 0x100>;
+ reg-names = "tcm", "cfg_reg";
+ interrupts = ;
+ clocks = <&topckgen TOP_SCP_SEL>;
+ clock-names = "main";
+ iommus = <&iommu M4U_PORT_VENC_RCPU>;
+ };
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3 5/8] media: vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver
From: Andrew-CT Chen Add v4l2 layer encoder driver for MT8173 Signed-off-by: Tiffany Lin --- drivers/media/platform/Kconfig | 11 + drivers/media/platform/Makefile|2 + drivers/media/platform/mtk-vcodec/Makefile |8 + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 391 ++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1433 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 46 + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 454 +++ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 102 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 29 + drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 85 ++ drivers/media/platform/mtk-vcodec/venc_drv_base.h | 62 + drivers/media/platform/mtk-vcodec/venc_drv_if.c| 100 ++ drivers/media/platform/mtk-vcodec/venc_drv_if.h| 175 +++ drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 212 +++ include/uapi/linux/v4l2-controls.h |4 + 18 files changed, 3368 insertions(+) create mode 100644 drivers/media/platform/mtk-vcodec/Makefile create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_base.h create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.c create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.h create mode 100644 drivers/media/platform/mtk-vcodec/venc_ipi_msg.h diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ba812d6..3e831c5 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -157,6 +157,17 @@ config VIDEO_MEDIATEK_VPU codec embedded in new Mediatek's SOCs. It is able to handle video decoding/encoding in a range of formats. +config VIDEO_MEDIATEK_VCODEC +tristate "Mediatek Video Codec driver" +depends on VIDEO_DEV && VIDEO_V4L2 +depends on ARCH_MEDIATEK || COMPILE_TEST +select VIDEOBUF2_DMA_CONTIG +select V4L2_MEM2MEM_DEV +select MEDIATEK_VPU +default n +---help--- +Mediatek video codec driver for V4L2 + config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index e5b19c6..510e06b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -57,3 +57,5 @@ obj-$(CONFIG_VIDEO_XILINX)+= xilinx/ ccflags-y += -I$(srctree)/drivers/media/i2c obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ + +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC)+= mtk-vcodec/ diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mtk-vcodec/Makefile new file mode 100644 index 000..ce38689 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Makefile @@ -0,0 +1,8 @@ +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \ + mtk_vcodec_util.o \ + mtk_vcodec_enc_drv.o \ + mtk_vcodec_enc.o \ + mtk_vcodec_enc_pm.o \ + venc_drv_if.o + +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h new file mode 100644 index 000..9744bd9 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -0,0 +1,391 @@ +/* +* Copyright (c) 2015 MediaTek Inc. +* Author: PC Chen +* Tiffany Lin +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE
[PATCH v3 7/8] media: vcodec: mediatek: Add Mediatek H264 Video Encoder Driver
Add h264 encoder driver for MT8173
Signed-off-by: Daniel Hsiao
Signed-off-by: Tiffany Lin
---
drivers/media/platform/mtk-vcodec/Makefile |3 +-
.../media/platform/mtk-vcodec/h264_enc/Makefile|6 +
.../platform/mtk-vcodec/h264_enc/venc_h264_if.c| 530
.../platform/mtk-vcodec/h264_enc/venc_h264_if.h| 165 ++
.../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 310
.../platform/mtk-vcodec/h264_enc/venc_h264_vpu.h | 30 ++
drivers/media/platform/mtk-vcodec/venc_drv_if.c|3 +
7 files changed, 1046 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/Makefile
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.h
diff --git a/drivers/media/platform/mtk-vcodec/Makefile
b/drivers/media/platform/mtk-vcodec/Makefile
index f4ef502..f47dfc7 100644
--- a/drivers/media/platform/mtk-vcodec/Makefile
+++ b/drivers/media/platform/mtk-vcodec/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
mtk_vcodec_enc_pm.o \
venc_drv_if.o
-obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/
+
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/ h264_enc/
ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
new file mode 100644
index 000..765b45f
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_h264_if.o venc_h264_vpu.o
+
+ccflags-y += \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/h264_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
new file mode 100644
index 000..14990ce
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
@@ -0,0 +1,530 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Jungchang Tsao
+ * Daniel Hsiao
+ * PoChun Lin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+
+#include "mtk_vcodec_drv.h"
+#include "mtk_vcodec_util.h"
+#include "mtk_vcodec_intr.h"
+#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_pm.h"
+#include "mtk_vpu.h"
+
+#include "venc_h264_if.h"
+#include "venc_h264_vpu.h"
+
+#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
+
+static inline void h264_write_reg(struct venc_h264_inst *inst, u32 addr,
+ u32 val)
+{
+ writel(val, inst->hw_base + addr);
+}
+
+static inline u32 h264_read_reg(struct venc_h264_inst *inst, u32 addr)
+{
+ return readl(inst->hw_base + addr);
+}
+
+enum venc_h264_irq_status {
+ H264_IRQ_STATUS_ENC_SPS_INT = (1 << 0),
+ H264_IRQ_STATUS_ENC_PPS_INT = (1 << 1),
+ H264_IRQ_STATUS_ENC_FRM_INT = (1 << 2),
+};
+
+static void h264_enc_free_work_buf(struct venc_h264_inst *inst)
+{
+ int i;
+
+ mtk_vcodec_debug_enter(inst);
+
+ /* Except the RC_CODE and SKIP_FRAME buffers,
+* other buffers need to be freed by AP.
+*/
+ for (i = 0; i < VENC_H264_VPU_WORK_BUF_MAX; i++) {
+ if ((i != VENC_H264_VPU_WORK_BUF_RC_CODE) &&
+ (i != VENC_H264_VPU_WORK_BUF_SKIP_FRAME))
+ if (inst->work_bufs[i].va != NULL)
+ mtk_vcodec_mem_free(inst->ctx,
+ &inst->work_bufs[i]);
+ }
+
+ if (inst->pps_buf.va != NULL)
+ mtk_vcodec_mem_free(inst->ctx, &inst->pps_buf);
+
+ mtk_vcodec_debug_leave(inst);
+}
+
+static int h264_enc_alloc_work_buf(struct venc_h264_inst *inst, void *param)
+{
+ int i;
+ int ret = 0;
+ struct venc_h264_vpu_buf *wb = inst->vpu_inst.drv->work_bufs;
+ struct venc_enc_prm *enc_param = param;
+
+ mtk_vcodec_debug_enter(inst);
+
+ for (i = 0; i < VENC_H264_VPU_WORK_BUF_MAX; i++) {
+
[PATCH v3 0/8] Add MT8173 Video Encoder Driver and VPU Driver
_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 11 Private Controls: 2 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: fail: ../../../v4l-utils-1.6.0/utils/v4l2-compliance/v4l2-test-buffers.cpp(266): vp->length == 0 fail: ../../../v4l-utils-1.6.0/utils/v4l2-compliance/v4l2-test-buffers.cpp(335): buf.check(Unqueued, i) fail: ../../../v4l-utils-1.6.0/utils/v4l2-compliance/v4l2-test-buffers.cpp(420): testQueryBuf(node, i, q.g_buffers()) test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: FAIL fail: ../../../v4l-utils-1.6.0/utils/v4l2-compliance/v4l2-test-buffers.cpp(500): q.has_expbuf(node) test VIDIOC_EXPBUF: FAIL Total: 38, Succeeded: 36, Failed: 2, Warnings: 0 Change in v2: Vcodec Part 1.Remove common and include directory in mtk-vcodec 2.Refine vb2ops_venc_start_streaming and vb2ops_venc_stop_streaming and state machine 3.Remove venc_if_init and venc_if_deinit 4.Refine debug message 5.Refine lab and vpu decription in mediatek-vcodec.txt VPU Part 1. Modify VPU Kconfig 2. Move encoder header files to other patch sets 3. Remove marcos for extended virtual/iova address 4. Change register and variable names 5. Add a reference counter for VPU watchdog 6. Remove one busy waiting in function vpu_ipi_send 7. Operate VPU clock in VPU driver (not called by encoder drivers) 8. Refine memory mapping, firmware download and extended memory allocation/free functions 9. Release more allocated resources in driver remove function Andrew-CT Chen (2): dt-bindings: Add a binding for Mediatek Video Processor media: vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver Tiffany Lin (6): media: VPU: mediatek: support Mediatek VPU arm64: dts: mediatek: Add node for Mediatek Video Processor Unit dt-bindings: Add a binding for Mediatek Video Encoder media: vcodec: mediatek: Add Mediatek VP8 Video Encoder Driver media: vcodec: mediatek: Add Mediatek H264 Video Encoder Driver arm64: dts: mediatek: Add Video Encoder for MT8173 .../devicetree/bindings/media/mediatek-vcodec.txt | 58 + .../devicetree/bindings/media/mediatek-vpu.txt | 27 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 48 + drivers/media/platform/Kconfig | 20 + drivers/media/platform/Makefile|4 + drivers/media/platform/mtk-vcodec/Makefile | 11 + .../media/platform/mtk-vcodec/h264_enc/Makefile|6 + .../platform/mtk-vcodec/h264_enc/venc_h264_if.c| 530 .../platform/mtk-vcodec/h264_enc/venc_h264_if.h| 165 +++ .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 310 + .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.h | 30 + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 391 ++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1433 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 46 + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 454 +++ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 102 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 29 + drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 85 ++ drivers/media/platform/mtk-vcodec/venc_drv_base.h | 62 + drivers/media/platform/mtk-vcodec/venc_drv_if.c| 106 ++ drivers/media/platform/mtk-vcodec/venc_drv_if.h| 175 +++ drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 212 +++ drivers/media/platform/mtk-vcodec/vp8_enc/Makefile |6 + .../platform/mtk-vcodec/vp8_enc/venc_vp8_if.c | 419 ++ .../platform/mtk-vcodec/vp8_enc/venc_vp8_if.h | 145 ++ .../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c | 221 +++ .../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.h | 28 + drivers/media/platform/mtk-vpu/Makefile|1 + drivers/media/platform/mtk-vpu/mtk_vpu.c | 941 + drivers/media/platform/mtk-vpu/mtk_vpu.h | 182 +++ include/uapi/linux/v4l2-controls.h |4 + 34 files changed, 6505 insertions(+) create mode 100644 Documentation/devicetree/bindings/m
[PATCH v3 4/8] dt-bindings: Add a binding for Mediatek Video Encoder
Add a DT binding documentation of Video Encoder for the
MT8173 SoC from Mediatek.
Signed-off-by: Tiffany Lin
---
.../devicetree/bindings/media/mediatek-vcodec.txt | 58
1 file changed, 58 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-vcodec.txt
diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
new file mode 100644
index 000..5cc35ae
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
@@ -0,0 +1,58 @@
+Mediatek Video Codec
+
+Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
+supports high resolution encoding functionalities.
+
+Required properties:
+- compatible : "mediatek,mt8173-vcodec-enc" for encoder
+- reg : Physical base address of the video codec registers and length of
+ memory mapped region.
+- interrupts : interrupt number to the cpu.
+- mediatek,larb : must contain the local arbiters in the current Socs.
+- clocks : list of clock specifiers, corresponding to entries in
+ the clock-names property;
+- clock-names: must contain "vencpll", "venc_lt_sel", "vcodecpll_370p5_ck"
+- iommus : list of iommus specifiers should be enabled for hw encode.
+ There are 2 cells needed to enable/disable iommu.
+ The first one is local arbiter index(larbid), and the other is port
+ index(portid) within local arbiter. Specifies the larbid and portid
+ as defined in dt-binding/memory/mt8173-larb-port.h.
+- mediatek,vpu : the node of video processor unit
+
+Example:
+vcodec_enc: vcodec@0x18002000 {
+compatible = "mediatek,mt8173-vcodec-enc";
+reg = <0 0x18002000 0 0x1000>,/*VENC_SYS*/
+ <0 0x19002000 0 0x1000>;/*VENC_LT_SYS*/
+interrupts = ,
+ ;
+mediatek,larb = <&larb3>,
+ <&larb5>;
+iommus = <&iommu M4U_PORT_VENC_RCPU>,
+ <&iommu M4U_PORT_VENC_REC>,
+ <&iommu M4U_PORT_VENC_BSDMA>,
+ <&iommu M4U_PORT_VENC_SV_COMV>,
+ <&iommu M4U_PORT_VENC_RD_COMV>,
+ <&iommu M4U_PORT_VENC_CUR_LUMA>,
+ <&iommu M4U_PORT_VENC_CUR_CHROMA>,
+ <&iommu M4U_PORT_VENC_REF_LUMA>,
+ <&iommu M4U_PORT_VENC_REF_CHROMA>,
+ <&iommu M4U_PORT_VENC_NBM_RDMA>,
+ <&iommu M4U_PORT_VENC_NBM_WDMA>,
+ <&iommu M4U_PORT_VENC_RCPU_SET2>,
+ <&iommu M4U_PORT_VENC_REC_FRM_SET2>,
+ <&iommu M4U_PORT_VENC_BSDMA_SET2>,
+ <&iommu M4U_PORT_VENC_SV_COMA_SET2>,
+ <&iommu M4U_PORT_VENC_RD_COMA_SET2>,
+ <&iommu M4U_PORT_VENC_CUR_LUMA_SET2>,
+ <&iommu M4U_PORT_VENC_CUR_CHROMA_SET2>,
+ <&iommu M4U_PORT_VENC_REF_LUMA_SET2>,
+ <&iommu M4U_PORT_VENC_REC_CHROMA_SET2>;
+mediatek,vpu = <&vpu>;
+clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
+ <&topckgen CLK_TOP_VENC_LT_SEL>,
+ <&topckgen CLK_TOP_VCODECPLL_370P5>;
+clock-names = "vencpll",
+ "venc_lt_sel",
+ "vcodecpll_370p5_ck";
+ };
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 6/8] [Media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver
On Wed, 2015-12-16 at 14:47 +0100, Hans Verkuil wrote:
> On 12/16/15 14:17, tiffany lin wrote:
> > Hi Hans,
> >
> >
> > On Tue, 2015-12-15 at 15:17 +0100, Hans Verkuil wrote:
> >>
> >> On 12/15/15 14:51, tiffany lin wrote:
> >>> We are not familiar with v4l2-compliance utility, we will check how to
> >>> use it.
> >>
> >> It's part of v4l-utils.git (http://git.linuxtv.org/v4l-utils.git/). There
> >> is a
> >> fairly decent man page. It does exhaustive compliance tests for V4L2
> >> devices.
> >>
> >> That said, the support for memory-to-memory codec devices is not great, so
> >> I wouldn't
> >> trust any failures it reports when using the streaming tests (i.e. the
> >> --stream*
> >> options). By default just run 'v4l2-compliance -d /dev/videoX' to do the
> >> compliance
> >> test.
> >>
> >> Note: before I accept this driver I do want to see that compliance test
> >> output!
> >>
> > Got it. We will provide it in next version.
> > Now our driver is developed and run base on kernel v3.18.
> > V4L2 and vb2 have some difference between Linux 4.4-rc1 and 3.18 kernel.
> > Is it ok we provided test output base on v3.18 or we need to base on
> > 4.4-rc1?
>
> I'm actually not sure if the latest v4l2-compliance test suite will work with
> a 3.18
> kernel. so either you have to go back to an older version of v4l2-compliance
> that
> works with 3.18 (go back to commit 4a57509a8334aca6ca8e81cd3beb08d5be397dac,
> that
> might do the trick) or (and that's what I recommend) go with the latest
> kernel.
>
> For the media tree that is http://git.linuxtv.org/media_tree.git/log/.
>
> The final version of the patch has to be against that kernel anyway.
>
Got it. Thanks for your help, we will try it. ^_^
> >>>>> +}
> >>>>> +
> >>>>> +int m2mctx_venc_queue_init(void *priv, struct vb2_queue *src_vq,
> >>>>> + struct vb2_queue *dst_vq)
> >>>>> +{
> >>>>> + struct mtk_vcodec_ctx *ctx = priv;
> >>>>> + int ret;
> >>>>> +
> >>>>> + src_vq->type= V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
> >>>>> + src_vq->io_modes= VB2_DMABUF | VB2_MMAP | VB2_USERPTR;
> >>>>
> >>>> You're using videobuf2-dma-contig, so VB2_USERPTR is generally useless
> >>>> in that
> >>>> case. I would drop it.
> >>>>
> >>> Sorry, I don't get it.
> >>> We are using videobuf2-dma-contig, but we also using VB2_USERPTR.
> >>
> >> In that case the user pointer you pass in must point to physically
> >> contiguous
> >> memory. Which means you got it through some magic. Typically what should
> >> be used
> >> are dmabuf handles to pass buffers around between different subsystems.
> >>
> >> The use of VB2_USERPTR for that purpose is deprecated.
> >>
> >> Or am I misunderstanding you as well?
> >>
> > Our encoder support all three modes.
> > In case that A driver + Encode driver flow, OUTPUT buffer will be
> > VB2_DMABUF from A driver.
> > In case that read YCbCr frame data from file and encode them to bit
> > stream flow, we use VB2_USERPTR and VB2_MMAP.
> > In VB2_USERPTR case, videobuf2-dma-contig will help us get continuous
> > dma address.
> > Our chip has IOMMU and M4U that help us get continuous phy address for
> > encode HW.
> >
> > http://lists.infradead.org/pipermail/linux-mediatek/2015-October/002525.html
>
> Ah, OK. Have you tested this with malloc()ed buffers? Just asking :-)
>
Yes. Actually we tested this with new()ed buffers. I think it default
call malloc.
> Regards,
>
> Hans
best regards,
Tiffany
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 6/8] [Media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver
Hi Hans, On Tue, 2015-12-15 at 15:17 +0100, Hans Verkuil wrote: > > On 12/15/15 14:51, tiffany lin wrote: > > Hi Hans, > > > > Thanks for your time. > > > > On Mon, 2015-12-14 at 13:50 +0100, Hans Verkuil wrote: > >> Hi Tiffany, > >> > >> My apologies for the long delay, but I finally have time to do a review of > >> this > >> code. > >> > >> On 12/11/2015 10:55 AM, Tiffany Lin wrote: > >>> From: Andrew-CT Chen > >>> > >>> Add v4l2 layer encoder driver for MT8173 > >>> > >>> Signed-off-by: Tiffany Lin > >>> --- > >>> drivers/media/platform/Kconfig | 11 + > >>> drivers/media/platform/Makefile|2 + > >>> drivers/media/platform/mtk-vcodec/Makefile |8 + > >>> drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 412 + > >>> drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1670 > >>> > >>> drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 45 + > >>> .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 469 ++ > >>> .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ > >>> .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 102 ++ > >>> .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 29 + > >>> drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + > >>> .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ > >>> .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 85 + > >>> drivers/media/platform/mtk-vcodec/venc_drv_base.h | 62 + > >>> drivers/media/platform/mtk-vcodec/venc_drv_if.c| 102 ++ > >>> drivers/media/platform/mtk-vcodec/venc_drv_if.h| 174 ++ > >>> drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 212 +++ > >>> 17 files changed, 3637 insertions(+) > >>> create mode 100644 drivers/media/platform/mtk-vcodec/Makefile > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c > >>> create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_base.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.c > >>> create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.h > >>> create mode 100644 drivers/media/platform/mtk-vcodec/venc_ipi_msg.h > >>> > >> > >> > >> > >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > >>> b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > >>> new file mode 100644 > >>> index 000..d59064d > >>> --- /dev/null > >>> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > >>> @@ -0,0 +1,1670 @@ > >>> +/* > >>> +* Copyright (c) 2015 MediaTek Inc. > >>> +* Author: PC Chen > >>> +* Tiffany Lin > >>> +* > >>> +* This program is free software; you can redistribute it and/or modify > >>> +* it under the terms of the GNU General Public License version 2 as > >>> +* published by the Free Software Foundation. > >>> +* > >>> +* This program is distributed in the hope that it will be useful, > >>> +* but WITHOUT ANY WARRANTY; without even the implied warranty of > >>> +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >>> +* GNU General Public License for more details. > >>> +*/ > >>> + > >>> +#include > >>> +#include > >>> +#include > >>> + > >>> +#include "mtk_vcodec_drv.h" > >>> +#include "mtk_vcodec_enc.h" > >>> +#include "mtk_vcodec_intr.h&quo
Re: [PATCH v2 6/8] [Media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver
Hi Hans,
Thanks for your time.
On Mon, 2015-12-14 at 13:50 +0100, Hans Verkuil wrote:
> Hi Tiffany,
>
> My apologies for the long delay, but I finally have time to do a review of
> this
> code.
>
> On 12/11/2015 10:55 AM, Tiffany Lin wrote:
> > From: Andrew-CT Chen
> >
> > Add v4l2 layer encoder driver for MT8173
> >
> > Signed-off-by: Tiffany Lin
> > ---
> > drivers/media/platform/Kconfig | 11 +
> > drivers/media/platform/Makefile|2 +
> > drivers/media/platform/mtk-vcodec/Makefile |8 +
> > drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 412 +
> > drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1670
> >
> > drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 45 +
> > .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 469 ++
> > .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++
> > .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 102 ++
> > .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 29 +
> > drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 +
> > .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++
> > .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 85 +
> > drivers/media/platform/mtk-vcodec/venc_drv_base.h | 62 +
> > drivers/media/platform/mtk-vcodec/venc_drv_if.c| 102 ++
> > drivers/media/platform/mtk-vcodec/venc_drv_if.h| 174 ++
> > drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 212 +++
> > 17 files changed, 3637 insertions(+)
> > create mode 100644 drivers/media/platform/mtk-vcodec/Makefile
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_base.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
> >
>
>
>
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > new file mode 100644
> > index 000..d59064d
> > --- /dev/null
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > @@ -0,0 +1,1670 @@
> > +/*
> > +* Copyright (c) 2015 MediaTek Inc.
> > +* Author: PC Chen
> > +* Tiffany Lin
> > +*
> > +* This program is free software; you can redistribute it and/or modify
> > +* it under the terms of the GNU General Public License version 2 as
> > +* published by the Free Software Foundation.
> > +*
> > +* This program is distributed in the hope that it will be useful,
> > +* but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > +* GNU General Public License for more details.
> > +*/
> > +
> > +#include
> > +#include
> > +#include
> > +
> > +#include "mtk_vcodec_drv.h"
> > +#include "mtk_vcodec_enc.h"
> > +#include "mtk_vcodec_intr.h"
> > +#include "mtk_vcodec_util.h"
> > +#include "venc_drv_if.h"
> > +
> > +static void mtk_venc_worker(struct work_struct *work);
> > +
> > +static struct mtk_video_fmt mtk_video_formats[] = {
> > + {
> > + .name = "4:2:0 3 Planes Y/Cb/Cr",
>
> Don't add the name. The v4l2 core will set that for you. This ensures that
> the name is
> always the same for the format, instead of being driver dependent.
>
We will remove it in next version.
> > + .fourcc = V4L2_PIX_FMT_YUV420,
> > + .type = MTK_FMT_FRAME,
> > + .num_planes = 3,
> > + },
> > + {
> > + .name
Re: [PATCH v2 5/8] arm64: dts: mediatek: Add Video Encoder for MT8173
Hi Matthias,
On Mon, 2015-12-14 at 19:18 +0100, Matthias Brugger wrote:
> On Friday 11 Dec 2015 17:55:40 Tiffany Lin wrote:
> > Add video encoder node for MT8173
> >
> > Signed-off-by: Tiffany Lin
> > ---
> > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 47
> > ++ 1 file changed, 47 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index b8c8ff0..a6b0fcf 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
> > @@ -545,6 +545,53 @@
> > #clock-cells = <1>;
> > };
> >
> > + larb3: larb@18001000 {
> > + compatible = "mediatek,mt8173-smi-larb";
> > + reg = <0 0x18001000 0 0x1000>;
> > + mediatek,smi = <&smi_common>;
> > + power-domains = <&scpsys MT8173_POWER_DOMAIN_VENC>;
> > + clocks = <&vencsys CLK_VENC_CKE1>,
> > +<&vencsys CLK_VENC_CKE0>;
> > + clock-names = "apb", "smi";
> > + };
> > +
> > + vcodec_enc: vcodec@18002000 {
> > + compatible = "mediatek,mt8173-vcodec-enc";
> > + reg = <0 0x18002000 0 0x1000>, /* VENC_SYS */
> > + <0 0x19002000 0 0x1000>; /* VENC_LT_SYS */
> > + interrupts = ,
> > +;
> > + larb = <&larb3>,
> > + <&larb5>;
>
> should be mediatek,larb or just larb for all instances of the larb's.
> See my other email about the bindings.
>
Yes, it should be mediatek,larb.
We will fix this and mediatek,vpu in next version.
best regards,
Tiffany
> Regards,
> Matthias
>
> > + iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
> > +<&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
> > +<&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_REC_FRM_SET2>,
> > +<&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_SV_COMA_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_RD_COMA_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_CUR_LUMA_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_CUR_CHROMA_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_REF_LUMA_SET2>,
> > +<&iommu M4U_LARB5_ID
> > M4U_PORT_VENC_REC_CHROMA_SET2>;
> > + vpu = <&vpu>;
> > + clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
> > +<&topckgen CLK_TOP_VENC_LT_SEL>,
> > +<&topckgen CLK_TOP_VCODECPLL_370P5>;
> > + clock-names = "vencpll",
> > + "venc_lt_sel",
> > + "vcodecpll_370p5_ck";
> > + };
> > +
> > vencltsys: clock-controller@1900 {
> > compatible = "mediatek,mt8173-vencltsys", "syscon";
> > reg = <0 0x1900 0 0x1000>;
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 4/8] dt-bindings: Add a binding for Mediatek Video Encoder
Hi Matthias,
On Mon, 2015-12-14 at 12:36 +0100, Matthias Brugger wrote:
>
> On 14/12/15 09:26, tiffany lin wrote:
> > On Fri, 2015-12-11 at 11:29 -0600, Rob Herring wrote:
> >> On Fri, Dec 11, 2015 at 05:55:39PM +0800, Tiffany Lin wrote:
> >>> Add a DT binding documentation of Video Encoder for the
> >>> MT8173 SoC from Mediatek.
> >>>
> >>> Signed-off-by: Tiffany Lin
> >>
> >> A question and minor issue below, otherwise:
> >>
> >> Acked-by: Rob Herring
> >>
> >>> ---
> >>> .../devicetree/bindings/media/mediatek-vcodec.txt | 58
> >>>
> >>> 1 file changed, 58 insertions(+)
> >>> create mode 100644
> >>> Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >>>
> >>> diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >>> b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >>> new file mode 100644
> >>> index 000..510cd81
> >>> --- /dev/null
> >>> +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >>> @@ -0,0 +1,58 @@
> >>> +Mediatek Video Codec
> >>> +
> >>> +Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
> >>> +supports high resolution encoding functionalities.
> >>> +
> >>> +Required properties:
> >>> +- compatible : "mediatek,mt8173-vcodec-enc" for encoder
> >>> +- reg : Physical base address of the video codec registers and length of
> >>> + memory mapped region.
> >>> +- interrupts : interrupt number to the cpu.
> >>> +- mediatek,larb : must contain the local arbiters in the current Socs.
>
> This looks strange, shouldn't it be "larb" instead of "mediatek,larb".
> At least the example does not use the mediatek prefix.
>
We plan to change larb and vpu to mediate,larb and mediatek,vpu.
We will fix this unmatch issue in next version.
best regards,
Tiffany
> >>> +- clocks : list of clock specifiers, corresponding to entries in
> >>> + the clock-names property;
> >>> +- clock-names: must contain "vencpll", "venc_lt_sel",
> >>> "vcodecpll_370p5_ck"
> >>> +- iommus : list of iommus specifiers should be enabled for hw encode.
> >>> + There are 2 cells needed to enable/disable iommu.
> >>> + The first one is local arbiter index(larbid), and the other is port
> >>> + index(portid) within local arbiter. Specifies the larbid and portid
> >>> + as defined in dt-binding/memory/mt8173-larb-port.h.
> >>> +- mediatek,vpu : the node of video processor unit
>
> Same here.
>
> Regards,
> Matthias
>
> >>> +
> >>> +Example:
> >>> +vcodec_enc: vcodec@0x18002000 {
> >>> +compatible = "mediatek,mt8173-vcodec-enc";
> >>> +reg = <0 0x18002000 0 0x1000>,/*VENC_SYS*/
> >>> + <0 0x19002000 0 0x1000>;/*VENC_LT_SYS*/
> >>> +interrupts = ,
> >>> + ;
> >>> +larb = <&larb3>,
> >>> + <&larb5>;
> >>> +iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
> >>
> >> Is this the same iommu as the VPU? If so, you can't have a mixed number
> >> of cells.
> > Yes, its same iommus as the VPU.
> > Now we use two parameters for iommus.
> > We will fix this in next version.
> >
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
> >>> + <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
> >>> + <&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
> >>> + <&iommu M4U_LARB5_ID M4U_PORT_VEN
Re: [PATCH v2 4/8] dt-bindings: Add a binding for Mediatek Video Encoder
On Fri, 2015-12-11 at 11:29 -0600, Rob Herring wrote:
> On Fri, Dec 11, 2015 at 05:55:39PM +0800, Tiffany Lin wrote:
> > Add a DT binding documentation of Video Encoder for the
> > MT8173 SoC from Mediatek.
> >
> > Signed-off-by: Tiffany Lin
>
> A question and minor issue below, otherwise:
>
> Acked-by: Rob Herring
>
> > ---
> > .../devicetree/bindings/media/mediatek-vcodec.txt | 58
> >
> > 1 file changed, 58 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >
> > diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > new file mode 100644
> > index 000..510cd81
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > @@ -0,0 +1,58 @@
> > +Mediatek Video Codec
> > +
> > +Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
> > +supports high resolution encoding functionalities.
> > +
> > +Required properties:
> > +- compatible : "mediatek,mt8173-vcodec-enc" for encoder
> > +- reg : Physical base address of the video codec registers and length of
> > + memory mapped region.
> > +- interrupts : interrupt number to the cpu.
> > +- mediatek,larb : must contain the local arbiters in the current Socs.
> > +- clocks : list of clock specifiers, corresponding to entries in
> > + the clock-names property;
> > +- clock-names: must contain "vencpll", "venc_lt_sel", "vcodecpll_370p5_ck"
> > +- iommus : list of iommus specifiers should be enabled for hw encode.
> > + There are 2 cells needed to enable/disable iommu.
> > + The first one is local arbiter index(larbid), and the other is port
> > + index(portid) within local arbiter. Specifies the larbid and portid
> > + as defined in dt-binding/memory/mt8173-larb-port.h.
> > +- mediatek,vpu : the node of video processor unit
> > +
> > +Example:
> > +vcodec_enc: vcodec@0x18002000 {
> > +compatible = "mediatek,mt8173-vcodec-enc";
> > +reg = <0 0x18002000 0 0x1000>,/*VENC_SYS*/
> > + <0 0x19002000 0 0x1000>;/*VENC_LT_SYS*/
> > +interrupts = ,
> > + ;
> > +larb = <&larb3>,
> > + <&larb5>;
> > +iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
>
> Is this the same iommu as the VPU? If so, you can't have a mixed number
> of cells.
Yes, its same iommus as the VPU.
Now we use two parameters for iommus.
We will fix this in next version.
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_FRM_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_SV_COMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_RD_COMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_LUMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_CHROMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_REF_LUMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_CHROMA_SET2>;
> > +vpu = <&vpu>;
>
> Need to update the example.
Sorry, I didn't get it.
Do you means update VPU binding document "media/mediatek-vpu.txt"?
>
> > +clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
> > + <&topckgen CLK_TOP_VENC_LT_SEL>,
> > + <&topckgen CLK_TOP_VCODECPLL_370P5>;
> > +clock-names = "vencpll",
> > + "venc_lt_sel",
> > + "vcodecpll_370p5_ck";
> > + };
> > --
> > 1.7.9.5
> >
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 3/8] [media] VPU: mediatek: support Mediatek VPU
The VPU driver for hw video codec embedded in Mediatek's MT8173 SOCs. It is able to handle video decoding/encoding of in a range of formats. The driver provides with VPU firmware download, memory management and the communication interface between CPU and VPU. For VPU initialization, it will create virtual memory for CPU access and IOMMU address for vcodec hw device access. When a decode/encode instance opens a device node, vpu driver will download vpu firmware to the device. A decode/encode instant will decode/encode a frame using VPU interface to interrupt vpu to handle decoding/encoding jobs. Signed-off-by: Andrew-CT Chen Signed-off-by: Tiffany Lin --- drivers/media/platform/Kconfig | 10 + drivers/media/platform/Makefile |2 + drivers/media/platform/mtk-vpu/Makefile |1 + drivers/media/platform/mtk-vpu/mtk_vpu.c | 859 ++ drivers/media/platform/mtk-vpu/mtk_vpu.h | 149 ++ 5 files changed, 1021 insertions(+) create mode 100644 drivers/media/platform/mtk-vpu/Makefile create mode 100644 drivers/media/platform/mtk-vpu/mtk_vpu.c create mode 100644 drivers/media/platform/mtk-vpu/mtk_vpu.h diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ccbc974..f3776f5 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -148,6 +148,16 @@ config VIDEO_CODA Coda is a range of video codec IPs that supports H.264, MPEG-4, and other video formats. +config VIDEO_MEDIATEK_VPU + tristate "Mediatek Video Processor Unit" + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MEDIATEK || COMPILE_TEST + ---help--- + This driver provides downloading VPU firmware and + communicating with VPU. This driver for hw video + codec embedded in new Mediatek's SOCs. It is able + to handle video decoding/encoding in a range of formats. + config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index efa0295..e5b19c6 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -55,3 +55,5 @@ obj-$(CONFIG_VIDEO_AM437X_VPFE) += am437x/ obj-$(CONFIG_VIDEO_XILINX) += xilinx/ ccflags-y += -I$(srctree)/drivers/media/i2c + +obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mtk-vpu/Makefile new file mode 100644 index 000..d890a66 --- /dev/null +++ b/drivers/media/platform/mtk-vpu/Makefile @@ -0,0 +1 @@ +obj-y += mtk_vpu.o diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c new file mode 100644 index 000..8994f73 --- /dev/null +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c @@ -0,0 +1,859 @@ +/* +* Copyright (c) 2015 MediaTek Inc. +* Author: Andrew-CT Chen +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mtk_vpu.h" + +/** + * VPU (video processor unit) is a tiny processor controlling video hardware + * related to video codec, scaling and color format converting. + * VPU interfaces with other blocks by share memory and interrupt. + **/ + +#define INIT_TIMEOUT_MS2000U +#define IPI_TIMEOUT_MS 2000U +#define VPU_FW_VER_LEN 16 + +/* maximum program/data TCM (Tightly-Coupled Memory) size */ +#define VPU_PTCM_SIZE (96 * SZ_1K) +#define VPU_DTCM_SIZE (32 * SZ_1K) +/* the offset to get data tcm address */ +#define VPU_DTCM_OFFSET0x18000UL +/* daynamic allocated maximum extended memory size */ +#define VPU_EXT_P_SIZE SZ_1M +#define VPU_EXT_D_SIZE SZ_4M +/* maximum binary firmware size */ +#define VPU_P_FW_SIZE (VPU_PTCM_SIZE + VPU_EXT_P_SIZE) +#define VPU_D_FW_SIZE (VPU_DTCM_SIZE + VPU_EXT_D_SIZE) +/* the size of share buffer between Host and VPU */ +#define SHARE_BUF_SIZE 48 + +/* binary firmware name */ +#define VPU_P_FW "vpu_p.bin" +#define VPU_D_FW "vpu_d.bin" + +#define VPU_RESET 0x0 +#define VPU_TCM_CFG0x0008 +#define VPU_PMEM_EXT0_ADDR 0x000C +#define VPU_PMEM_EXT1_ADDR 0x0010 +#define VPU_TO_HOST0x001C +#define VPU_D
[PATCH v2 2/8] arm64: dts: mediatek: Add node for Mediatek Video Processor Unit
Add VPU drivers for MT8173
Signed-off-by: Andrew-CT Chen
Signed-off-by: Tiffany Lin
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 11 +++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 4dd5f93..b8c8ff0 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -258,6 +258,17 @@
clock-names = "spi", "wrap";
};
+ vpu: vpu@1002 {
+ compatible = "mediatek,mt8173-vpu";
+ reg = <0 0x1002 0 0x3>,
+ <0 0x1005 0 0x100>;
+ reg-names = "tcm", "cfg_reg";
+ interrupts = ;
+ clocks = <&topckgen CLK_TOP_SCP_SEL>;
+ clock-names = "main";
+ iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>;
+ };
+
sysirq: intpol-controller@10200620 {
compatible = "mediatek,mt8173-sysirq",
"mediatek,mt6577-sysirq";
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 4/8] dt-bindings: Add a binding for Mediatek Video Encoder
Add a DT binding documentation of Video Encoder for the
MT8173 SoC from Mediatek.
Signed-off-by: Tiffany Lin
---
.../devicetree/bindings/media/mediatek-vcodec.txt | 58
1 file changed, 58 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-vcodec.txt
diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
new file mode 100644
index 000..510cd81
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
@@ -0,0 +1,58 @@
+Mediatek Video Codec
+
+Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
+supports high resolution encoding functionalities.
+
+Required properties:
+- compatible : "mediatek,mt8173-vcodec-enc" for encoder
+- reg : Physical base address of the video codec registers and length of
+ memory mapped region.
+- interrupts : interrupt number to the cpu.
+- mediatek,larb : must contain the local arbiters in the current Socs.
+- clocks : list of clock specifiers, corresponding to entries in
+ the clock-names property;
+- clock-names: must contain "vencpll", "venc_lt_sel", "vcodecpll_370p5_ck"
+- iommus : list of iommus specifiers should be enabled for hw encode.
+ There are 2 cells needed to enable/disable iommu.
+ The first one is local arbiter index(larbid), and the other is port
+ index(portid) within local arbiter. Specifies the larbid and portid
+ as defined in dt-binding/memory/mt8173-larb-port.h.
+- mediatek,vpu : the node of video processor unit
+
+Example:
+vcodec_enc: vcodec@0x18002000 {
+compatible = "mediatek,mt8173-vcodec-enc";
+reg = <0 0x18002000 0 0x1000>,/*VENC_SYS*/
+ <0 0x19002000 0 0x1000>;/*VENC_LT_SYS*/
+interrupts = ,
+ ;
+larb = <&larb3>,
+ <&larb5>;
+iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_FRM_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_SV_COMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_RD_COMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_LUMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_CHROMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_REF_LUMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_CHROMA_SET2>;
+vpu = <&vpu>;
+clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
+ <&topckgen CLK_TOP_VENC_LT_SEL>,
+ <&topckgen CLK_TOP_VCODECPLL_370P5>;
+clock-names = "vencpll",
+ "venc_lt_sel",
+ "vcodecpll_370p5_ck";
+ };
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 5/8] arm64: dts: mediatek: Add Video Encoder for MT8173
Add video encoder node for MT8173
Signed-off-by: Tiffany Lin
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 47 ++
1 file changed, 47 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index b8c8ff0..a6b0fcf 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -545,6 +545,53 @@
#clock-cells = <1>;
};
+ larb3: larb@18001000 {
+ compatible = "mediatek,mt8173-smi-larb";
+ reg = <0 0x18001000 0 0x1000>;
+ mediatek,smi = <&smi_common>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_VENC>;
+ clocks = <&vencsys CLK_VENC_CKE1>,
+<&vencsys CLK_VENC_CKE0>;
+ clock-names = "apb", "smi";
+ };
+
+ vcodec_enc: vcodec@18002000 {
+ compatible = "mediatek,mt8173-vcodec-enc";
+ reg = <0 0x18002000 0 0x1000>, /* VENC_SYS */
+ <0 0x19002000 0 0x1000>; /* VENC_LT_SYS */
+ interrupts = ,
+;
+ larb = <&larb3>,
+ <&larb5>;
+ iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
+<&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_REC_FRM_SET2>,
+<&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_SV_COMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_RD_COMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_CUR_LUMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_CUR_CHROMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_REF_LUMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_REC_CHROMA_SET2>;
+ vpu = <&vpu>;
+ clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
+<&topckgen CLK_TOP_VENC_LT_SEL>,
+<&topckgen CLK_TOP_VCODECPLL_370P5>;
+ clock-names = "vencpll",
+ "venc_lt_sel",
+ "vcodecpll_370p5_ck";
+ };
+
vencltsys: clock-controller@1900 {
compatible = "mediatek,mt8173-vencltsys", "syscon";
reg = <0 0x1900 0 0x1000>;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 6/8] [Media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver
From: Andrew-CT Chen Add v4l2 layer encoder driver for MT8173 Signed-off-by: Tiffany Lin --- drivers/media/platform/Kconfig | 11 + drivers/media/platform/Makefile|2 + drivers/media/platform/mtk-vcodec/Makefile |8 + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 412 + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1670 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 45 + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 469 ++ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 102 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 29 + drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 85 + drivers/media/platform/mtk-vcodec/venc_drv_base.h | 62 + drivers/media/platform/mtk-vcodec/venc_drv_if.c| 102 ++ drivers/media/platform/mtk-vcodec/venc_drv_if.h| 174 ++ drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 212 +++ 17 files changed, 3637 insertions(+) create mode 100644 drivers/media/platform/mtk-vcodec/Makefile create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_base.h create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.c create mode 100644 drivers/media/platform/mtk-vcodec/venc_drv_if.h create mode 100644 drivers/media/platform/mtk-vcodec/venc_ipi_msg.h diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f3776f5..c80ca5c 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -158,6 +158,17 @@ config VIDEO_MEDIATEK_VPU codec embedded in new Mediatek's SOCs. It is able to handle video decoding/encoding in a range of formats. +config VIDEO_MEDIATEK_VCODEC +tristate "Mediatek Video Codec driver" +depends on VIDEO_DEV && VIDEO_V4L2 +depends on ARCH_MEDIATEK || COMPILE_TEST +select VIDEOBUF2_DMA_CONTIG +select V4L2_MEM2MEM_DEV +select MEDIATEK_VPU +default n +---help--- +Mediatek video codec driver for V4L2 + config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index e5b19c6..510e06b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -57,3 +57,5 @@ obj-$(CONFIG_VIDEO_XILINX)+= xilinx/ ccflags-y += -I$(srctree)/drivers/media/i2c obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ + +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC)+= mtk-vcodec/ diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mtk-vcodec/Makefile new file mode 100644 index 000..ce38689 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Makefile @@ -0,0 +1,8 @@ +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \ + mtk_vcodec_util.o \ + mtk_vcodec_enc_drv.o \ + mtk_vcodec_enc.o \ + mtk_vcodec_enc_pm.o \ + venc_drv_if.o + +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h new file mode 100644 index 000..1d6adde --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -0,0 +1,412 @@ +/* +* Copyright (c) 2015 MediaTek Inc. +* Author: PC Chen +* Tiffany Lin +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more de
[PATCH v2 1/8] dt-bindings: Add a binding for Mediatek Video Processor
From: Andrew-CT Chen
Add a DT binding documentation of Video Processor Unit for the
MT8173 SoC from Mediatek.
Signed-off-by: Andrew-CT Chen
Signed-off-by: Tiffany Lin
---
.../devicetree/bindings/media/mediatek-vpu.txt | 27
1 file changed, 27 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-vpu.txt
diff --git a/Documentation/devicetree/bindings/media/mediatek-vpu.txt
b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
new file mode 100644
index 000..3c3a424
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
@@ -0,0 +1,27 @@
+* Mediatek Video Processor Unit
+
+Video Processor Unit is a HW video controller. It controls HW Codec including
+H.264/VP8/VP9 Decode, H.264/VP8 Encode and Image Processor (scale/rotate/color
convert).
+
+Required properties:
+ - compatible: "mediatek,mt8173-vpu"
+ - reg: Must contain an entry for each entry in reg-names.
+ - reg-names: Must include the following entries:
+"tcm": tcm base
+"cfg_reg": Main configuration registers base
+ - interrupts: interrupt number to the cpu.
+ - clocks : clock name from clock manager
+ - clock-names: must be main. It is the main clock of VPU
+ - iommus : phandle and IOMMU spcifier for the IOMMU that serves the VPU.
+
+Example:
+ vpu: vpu@1002 {
+ compatible = "mediatek,mt8173-vpu";
+ reg = <0 0x1002 0 0x3>,
+ <0 0x1005 0 0x100>;
+ reg-names = "tcm", "cfg_reg";
+ interrupts = ;
+ clocks = <&topckgen TOP_SCP_SEL>;
+ clock-names = "main";
+ iommus = <&iommu M4U_PORT_VENC_RCPU>;
+ };
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 8/8] [media] vcodec: mediatek: Add Mediatek H264 Video Encoder Driver
Add h264 encoder driver for MT8173
Signed-off-by: Daniel Hsiao
Signed-off-by: Tiffany Lin
---
drivers/media/platform/mtk-vcodec/Makefile |3 +-
.../media/platform/mtk-vcodec/h264_enc/Makefile|8 +
.../platform/mtk-vcodec/h264_enc/venc_h264_if.c| 495
.../platform/mtk-vcodec/h264_enc/venc_h264_if.h| 161 +++
.../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 316 +
.../platform/mtk-vcodec/h264_enc/venc_h264_vpu.h | 30 ++
drivers/media/platform/mtk-vcodec/venc_drv_if.c|3 +
7 files changed, 1015 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/Makefile
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.h
diff --git a/drivers/media/platform/mtk-vcodec/Makefile
b/drivers/media/platform/mtk-vcodec/Makefile
index f4ef502..f47dfc7 100644
--- a/drivers/media/platform/mtk-vcodec/Makefile
+++ b/drivers/media/platform/mtk-vcodec/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
mtk_vcodec_enc_pm.o \
venc_drv_if.o
-obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/
+
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/ h264_enc/
ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
new file mode 100644
index 000..f1fe5cb
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
@@ -0,0 +1,8 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_h264_if.o venc_h264_vpu.o
+
+ccflags-y += \
+-I$(srctree)/include/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/include \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/h264_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
new file mode 100644
index 000..3ac80a4
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
@@ -0,0 +1,495 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Jungchang Tsao
+ * Daniel Hsiao
+ * PoChun Lin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+
+#include "mtk_vcodec_drv.h"
+#include "mtk_vcodec_util.h"
+#include "mtk_vcodec_intr.h"
+#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_pm.h"
+#include "mtk_vpu.h"
+
+#include "venc_h264_if.h"
+#include "venc_h264_vpu.h"
+
+#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
+
+static inline void h264_write_reg(struct venc_h264_inst *inst, u32 addr,
+ u32 val)
+{
+ writel(val, inst->hw_base + addr);
+}
+
+static inline u32 h264_read_reg(struct venc_h264_inst *inst, u32 addr)
+{
+ return readl(inst->hw_base + addr);
+}
+
+enum venc_h264_irq_status {
+ H264_IRQ_STATUS_ENC_SPS_INT = (1 << 0),
+ H264_IRQ_STATUS_ENC_PPS_INT = (1 << 1),
+ H264_IRQ_STATUS_ENC_FRM_INT = (1 << 2),
+};
+
+static int h264_enc_alloc_work_buf(struct venc_h264_inst *inst)
+{
+ int i, j;
+ int ret = 0;
+ struct venc_h264_vpu_buf *wb = inst->vpu_inst.drv->work_bufs;
+
+ mtk_vcodec_debug_enter(inst);
+
+ for (i = 0; i < VENC_H264_VPU_WORK_BUF_MAX; i++) {
+ /*
+* This 'wb' structure is set by VPU side and shared to AP for
+* buffer allocation and IO virtual addr mapping. For most of
+* the buffers, AP will allocate the buffer according to 'size'
+* field and store the IO virtual addr in 'iova' field. There
+* are two exceptions:
+* (1) RC_CODE buffer, it's pre-allocated in the VPU side, and
+* save the VPU addr in the 'vpua' field. The AP will translate
+* the VPU addr to the corresponding IO virtual addr and store
+* in 'iova' field for reg setting in VPU side.
+* (2) SKIP_FRAME buffer, it's pr
[PATCH v2 7/8] [media] vcodec: mediatek: Add Mediatek VP8 Video Encoder Driver
Add vp8 encoder driver for MT8173
Signed-off-by: Daniel Hsiao
Signed-off-by: Tiffany Lin
---
drivers/media/platform/mtk-vcodec/Makefile |2 +
drivers/media/platform/mtk-vcodec/venc_drv_if.c|3 +
drivers/media/platform/mtk-vcodec/vp8_enc/Makefile |8 +
.../platform/mtk-vcodec/vp8_enc/venc_vp8_if.c | 384
.../platform/mtk-vcodec/vp8_enc/venc_vp8_if.h | 141 +++
.../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c | 221 +++
.../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.h | 28 ++
7 files changed, 787 insertions(+)
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.h
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.h
diff --git a/drivers/media/platform/mtk-vcodec/Makefile
b/drivers/media/platform/mtk-vcodec/Makefile
index ce38689..f4ef502 100644
--- a/drivers/media/platform/mtk-vcodec/Makefile
+++ b/drivers/media/platform/mtk-vcodec/Makefile
@@ -5,4 +5,6 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
mtk_vcodec_enc_pm.o \
venc_drv_if.o
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/
+
ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c
b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
index 63e7df0..384e0d2 100644
--- a/drivers/media/platform/mtk-vcodec/venc_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
@@ -24,6 +24,7 @@
#include "mtk_vpu.h"
#include "venc_drv_base.h"
+#include "vp8_enc/venc_vp8_if.h"
int venc_if_create(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
{
@@ -34,6 +35,8 @@ int venc_if_create(struct mtk_vcodec_ctx *ctx, unsigned int
fourcc)
switch (fourcc) {
case V4L2_PIX_FMT_VP8:
+ctx->enc_if = get_vp8_enc_comm_if();
+break;
case V4L2_PIX_FMT_H264:
default:
goto err_out;
diff --git a/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
b/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
new file mode 100644
index 000..17a0dfe
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
@@ -0,0 +1,8 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_vp8_if.o venc_vp8_vpu.o
+
+ccflags-y += \
+-I$(srctree)/include/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/include \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/vp8_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
b/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
new file mode 100644
index 000..5201743
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
@@ -0,0 +1,384 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Daniel Hsiao
+ * PoChun Lin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+#include
+
+#include "mtk_vcodec_drv.h"
+#include "mtk_vcodec_util.h"
+#include "mtk_vcodec_intr.h"
+#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_pm.h"
+#include "mtk_vpu.h"
+
+#include "venc_vp8_if.h"
+#include "venc_vp8_vpu.h"
+
+#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
+#define VENC_PIC_BITSTREAM_BYTE_CNT1 0x00e8
+#define VENC_IRQ_STATUS_ENC_FRM_INT 0x04
+
+#define MAX_AC_TAG_SZ 10
+
+static inline void vp8_enc_write_reg(struct venc_vp8_inst *inst, u32 addr,
+u32 val)
+{
+ writel(val, inst->hw_base + addr);
+}
+
+static inline u32 vp8_enc_read_reg(struct venc_vp8_inst *inst, u32 addr)
+{
+ return readl(inst->hw_base + addr);
+}
+
+static void vp8_enc_free_work_buf(struct venc_vp8_inst *inst)
+{
+ int i;
+
+ mtk_vcodec_debug_enter(inst);
+
+ /* Except the RC_CODEx buffers, other buffers need to be freed by AP. */
+ for (i = 0; i < VENC_VP8_VPU_WORK_BUF_RC_CODE; i++)
+ if (inst->work_bufs[i].va != NULL)
+ mtk_vcodec_mem_free(inst->ctx, &inst->work_bufs[i]);
+
+ mtk_vcodec_debug_leave(inst);
+}
+
+static int vp8_enc_alloc_work_buf
[PATCH v2 0/8] Add MT8173 Video Encoder Driver and VPU Driver
== Introduction == The purpose of this RFC is to discuss the driver for a hw video codec embedded in the Mediatek's MT8173 SoCs. Mediatek Video Codec is able to handle video encoding of in a range of formats. This RFC also include VPU driver. Mediatek Video Codec driver rely on VPU driver to load, communicate with VPU. Internally the driver uses videobuf2 framework and MTK IOMMU and MTK SMI. MTK IOMMU and MTK SMI have not yet been merged, but we wanted to start discussion about the driver earlier so it could be merged sooner. The driver posted here is the initial version, so I suppose it will require more work. [1]http://lists.infradead.org/pipermail/linux-mediatek/2015-October/002525.html == Device interface == In principle the driver bases on memory-to-memory framework: it provides a single video node and each opened file handle gets its own private context with separate buffer queues. Each context consist of 2 buffer queues: OUTPUT (for source buffers, i.e. raw video frames) and CAPTURE (for destination buffers, i.e. encoded video frames). The process of encoding video data from stream is a bit more complicated than typical memory-to-memory processing. We base on memory-to-memory framework and add the complicated part in our vb2 and v4l2 callback functionss. So we can base on well done m2m memory-to-memory framework, reduce duplicate code and make our driver code simple. == VPU (Video Processor Unit) == The VPU driver for hw video codec embedded in Mediatek's MT8173 SOCs. It is able to handle video decoding/encoding of in a range of formats. The driver provides with VPU firmware download, memory management and the communication interface between CPU and VPU. For VPU initialization, it will create virtual memory for CPU access and IOMMU address for vcodec hw device access. When a decode/encode instance opens a device node, vpu driver will download vpu firmware to the device. A decode/encode instant will decode/encode a frame using VPU interface to interrupt vpu to handle decoding/encoding jobs. Please have a look at the code and comments will be very much appreciated. Change in v2: Vcodec Part 1.Remove common and include directory in mtk-vcodec 2.Refine vb2ops_venc_start_streaming and vb2ops_venc_stop_streaming and state machine 3.Remove venc_if_init and venc_if_deinit 4.Refine debug message 5.Refine lab and vpu decription in mediatek-vcodec.txt VPU Part 1. Modify VPU Kconfig 2. Move encoder header files to other patch sets 3. Remove marcos for extended virtual/iova address 4. Change register and variable names 5. Add a reference counter for VPU watchdog 6. Remove one busy waiting in function vpu_ipi_send 7. Operate VPU clock in VPU driver (not called by encoder drivers) 8. Refine memory mapping, firmware download and extended memory allocation/free functions 9. Release more allocated resources in driver remove function Andrew-CT Chen (2): dt-bindings: Add a binding for Mediatek Video Processor [Media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver Tiffany Lin (6): arm64: dts: mediatek: Add node for Mediatek Video Processor Unit [media] VPU: mediatek: support Mediatek VPU dt-bindings: Add a binding for Mediatek Video Encoder arm64: dts: mediatek: Add Video Encoder for MT8173 [media] vcodec: mediatek: Add Mediatek VP8 Video Encoder Driver [media] vcodec: mediatek: Add Mediatek H264 Video Encoder Driver .../devicetree/bindings/media/mediatek-vcodec.txt | 58 + .../devicetree/bindings/media/mediatek-vpu.txt | 27 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 58 + drivers/media/platform/Kconfig | 21 + drivers/media/platform/Makefile|4 + drivers/media/platform/mtk-vcodec/Makefile | 11 + .../media/platform/mtk-vcodec/h264_enc/Makefile|8 + .../platform/mtk-vcodec/h264_enc/venc_h264_if.c| 495 ++ .../platform/mtk-vcodec/h264_enc/venc_h264_if.h| 161 ++ .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 316 .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.h | 30 + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 412 + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1670 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 45 + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 469 ++ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 102 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 29 + drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 85 + drivers/media/platform/mtk-vcodec/venc_drv_base.h | 62 + drivers/media/platform/mtk-vcodec/venc_drv_if.c| 108 ++ drivers/media/pl
Re: [RESEND RFC/PATCH 6/8] media: platform: mtk-vcodec: Add Mediatek V4L2 Video Encoder Driver
On Tue, 2015-12-01 at 15:42 +, Daniel Thompson wrote:
> On 01/12/15 10:42, tiffany lin wrote:
> >>>> > diff --git a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
> >>>> b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
> >>>> > new file mode 100644
> >>>> > index 000..9b3f025
> >>>> > --- /dev/null
> > [snip]
> >>>> > +int venc_if_create(void *ctx, unsigned int fourcc, unsigned long
> >>>> *handle)
> >>>> > +{
> >>>> > + struct venc_handle *h;
> >>>> > + char str[10];
> >>>> > +
> >>>> > + mtk_vcodec_fmt2str(fourcc, str);
> >>>> > +
> >>>> > + h = kzalloc(sizeof(*h), GFP_KERNEL);
> >>>> > + if (!h)
> >>>> > + return -ENOMEM;
> >>>> > +
> >>>> > + h->fourcc = fourcc;
> >>>> > + h->ctx = ctx;
> >>>> > + mtk_vcodec_debug(h, "fmt = %s handle = %p", str, h);
> >>>> > +
> >>>> > + switch (fourcc) {
> >>>> > + default:
> >>>> > + mtk_vcodec_err(h, "invalid format %s", str);
> >>>> > + goto err_out;
> >>>> > + }
> >>>> > +
> >>>> > + *handle = (unsigned long)h;
> >>>> > + return 0;
> >>>> > +
> >>>> > +err_out:
> >>>> > + kfree(h);
> >>>> > + return -EINVAL;
> >>>> > +}
> >>>> > +
> >>>> > +int venc_if_init(unsigned long handle)
> >>>> > +{
> >>>> > + int ret = 0;
> >>>> > + struct venc_handle *h = (struct venc_handle *)handle;
> >>>> > +
> >>>> > + mtk_vcodec_debug_enter(h);
> >>>> > +
> >>>> > + mtk_venc_lock(h->ctx);
> >>>> > + mtk_vcodec_enc_clock_on();
> >>>> > + vpu_enable_clock(vpu_get_plat_device(h->ctx->dev->plat_dev));
> >>>> > + ret = h->enc_if->init(h->ctx, (unsigned long *)&h->drv_handle);
> >>>> > + vpu_disable_clock(vpu_get_plat_device(h->ctx->dev->plat_dev));
> >>>> > + mtk_vcodec_enc_clock_off();
> >>>> > + mtk_venc_unlock(h->ctx);
> >>>> > +
> >>>> > + return ret;
> >>>> > +}
> >>>>
> >>>> To me this looks more like an obfuscation layer rather than a
> >>>> abstraction layer. I don't understand why we need to hide things from
> >>>> the V4L2 implementation that this code forms part of.
> >>>>
> >>>> More importantly, if this code was included somewhere where it could be
> >>>> properly integrated with the device model you might be able to use the
> >>>> pm_runtime system to avoid this sort of "heroics" to manage the clocks
> >>>> anyway.
> >>>>
> >>> We want to abstract common part from encoder driver.
> >>> Every encoder driver follow same calling flow and only need to take care
> >>> about how to communicate with vpu to encode specific format.
> >>> Encoder driver do not need to take care clock and multiple instance
> >>> issue.
> >>
> >> Looking at each of those stages:
> >>
> >> mtk_venc_lock():
> >> Why isn't one of the existing V4L2 locking strategies ok for you?
> >>
> > We only has one encoder hw.
> > To support multiple encode instances.
> > When one encoder ctx access encoder hw, it need to get lock first.
> >
> >> mtk_vcodec_enc_clock_on():
> >> This does seem like something a sub-driver *should* be doing for itself
> > This is for enabling encoder hw related clock.
> > To support multiple instances, one encode ctx must get hw lock first
> > then clock on/off hw relate clock.
> >
> >> vpu_enable_clock():
> >> Why can't the VPU driver manage this internally using pm_runtime?
> >>
> > Our VPU do not have power domain.
> > We will remove VPU clock on/off and let vpu control it in next version.
> >
> >>
> >> That is why I described this as an obfuscation layer. It is collecting
> >> a bunch of stuff that can b
Re: [RESEND RFC/PATCH 6/8] media: platform: mtk-vcodec: Add Mediatek V4L2 Video Encoder Driver
On Mon, 2015-11-30 at 22:58 +0800, Daniel Thompson wrote: > On 30 November 2015 at 11:39, tiffany lin wrote: > >> > diff --git a/drivers/media/platform/mtk-vcodec/Makefile > >> > b/drivers/media/platform/mtk-vcodec/Makefile > >> > new file mode 100644 > >> > index 000..c7f7174 > >> > --- /dev/null > >> > +++ b/drivers/media/platform/mtk-vcodec/Makefile > >> > @@ -0,0 +1,12 @@ > >> > +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \ > >> > + mtk_vcodec_util.o \ > >> > + mtk_vcodec_enc_drv.o \ > >> > + mtk_vcodec_enc.o \ > >> > + mtk_vcodec_enc_pm.o > >> > + > >> > +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/ > >> > + > >> > +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vcodec/include \ > >> > +-I$(srctree)/drivers/media/platform/mtk-vcodec \ > >> > +-I$(srctree)/drivers/media/platform/mtk-vpu > >> > >> Seems like there's a lot of directories here. Are these files > >> (framework, common, vcodec, etc) so unrelated they really need to live > >> in separate directories? > >> > >> Why not just drivers/media/platform/mediatek? > > This is because VPU and Vcodec are two different drivers. > > Driver in mtk-vpu is for controlling VPU device and provide > > communication API to VPU. > > Driver in mtk-vcodec is for control different encoder (vp8, h264), it > > include v4l2 driver layer, glue layer between encoders and vp8 and h264 > > encoder. > > They may be separate pieces of hardware the drivers for them are very > clearly interlinked. This is obvious because the Makefiles are having > to set ccflags to pick up the headers of the other drivers. > > No other V4L2 driver uses ccflags-y in this manner. > Got it. We will remove -I from Makefile and put VPU header file in include/soc/mediatek > > >> > diff --git a/drivers/media/platform/mtk-vcodec/common/Makefile > >> > b/drivers/media/platform/mtk-vcodec/common/Makefile > >> > new file mode 100644 > >> > index 000..477ab80 > >> > --- /dev/null > >> > +++ b/drivers/media/platform/mtk-vcodec/common/Makefile > >> > @@ -0,0 +1,8 @@ > >> > +obj-y += \ > >> > +venc_drv_if.o > >> > + > >> > +ccflags-y += \ > >> > +-I$(srctree)/include/ \ > >> > +-I$(srctree)/drivers/media/platform/mtk-vcodec \ > >> > +-I$(srctree)/drivers/media/platform/mtk-vcodec/include \ > >> > +-I$(srctree)/drivers/media/platform/mtk-vpu > >> > >> As above, this appears to be a directory to hold just one file. > >> > > Sorry, I didn't get it. Could you explain more? > > Just that this is another example of the excessive directory structure. > > A directory that contains only one source file is a strong indication > that the splitting of the V4L2 implementation into directories is > excessive. > The directory that contains only one source file is because now we only upstream encoder patches. We have decoder patches in future. We will remove "common", "include" two directories and put files in mtk-vcodec in next version. > > >> > diff --git a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c > >> b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c > >> > new file mode 100644 > >> > index 000..9b3f025 > >> > --- /dev/null > >> > +++ b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c > >> > @@ -0,0 +1,152 @@ > >> > +/* > >> > + * Copyright (c) 2015 MediaTek Inc. > >> > + * Author: Daniel Hsiao > >> > + * Jungchang Tsao > >> > + * > >> > + * This program is free software; you can redistribute it and/or > >> > + * modify > >> > + * it under the terms of the GNU General Public License version 2 as > >> > + * published by the Free Software Foundation. > >> > + * > >> > + * This program is distributed in the hope that it will be useful, > >> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > >> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >> > + * GNU General Public License for more details. > >> > + */ > >> > + > >> > +#include > >&g
Re: [RESEND RFC/PATCH 6/8] media: platform: mtk-vcodec: Add Mediatek V4L2 Video Encoder Driver
On Fri, 2015-11-27 at 16:34 +, Daniel Thompson wrote: > Hi Tiffany/Andrew > > This review is a rather more superficial than my previous one. Mostly > I'm just commenting on some of the bits I spotted whilst trying to find > my way around the patchset. > > I hope to another more detailed review for v2 (and feel free to add me > to Cc:). > Thanks for your comments. > > On 17/11/15 12:54, Tiffany Lin wrote: > > Signed-off-by: Tiffany Lin > > Signed-off-by: Andrew-CT Chen > > There is no description of what this patch does. Its not enough to have > it on the cover letter (because that won't end up in version control). > You need something here. > Got it, We will add description for each patch in next version. > > > diff --git a/drivers/media/platform/mtk-vcodec/Kconfig > > b/drivers/media/platform/mtk-vcodec/Kconfig > > new file mode 100644 > > index 000..1c0b935 > > --- /dev/null > > +++ b/drivers/media/platform/mtk-vcodec/Kconfig > > @@ -0,0 +1,5 @@ > > +config MEDIATEK_VPU > > + bool > > + ---help--- > > + This driver provides downloading firmware vpu (video processor unit) > > + and communicating with vpu. > > Haven't I seen this before (in patch 3)? Why is it being added to > another Kconfig file? > We will remove this in next version. > > > diff --git a/drivers/media/platform/mtk-vcodec/Makefile > > b/drivers/media/platform/mtk-vcodec/Makefile > > new file mode 100644 > > index 000..c7f7174 > > --- /dev/null > > +++ b/drivers/media/platform/mtk-vcodec/Makefile > > @@ -0,0 +1,12 @@ > > +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \ > > + mtk_vcodec_util.o \ > > + mtk_vcodec_enc_drv.o \ > > + mtk_vcodec_enc.o \ > > + mtk_vcodec_enc_pm.o > > + > > +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/ > > + > > +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vcodec/include \ > > +-I$(srctree)/drivers/media/platform/mtk-vcodec \ > > +-I$(srctree)/drivers/media/platform/mtk-vpu > > Seems like there's a lot of directories here. Are these files > (framework, common, vcodec, etc) so unrelated they really need to live > in separate directories? > > Why not just drivers/media/platform/mediatek? This is because VPU and Vcodec are two different drivers. Driver in mtk-vpu is for controlling VPU device and provide communication API to VPU. Driver in mtk-vcodec is for control different encoder (vp8, h264), it include v4l2 driver layer, glue layer between encoders and vp8 and h264 encoder. > > > > diff --git a/drivers/media/platform/mtk-vcodec/common/Makefile > > b/drivers/media/platform/mtk-vcodec/common/Makefile > > new file mode 100644 > > index 000..477ab80 > > --- /dev/null > > +++ b/drivers/media/platform/mtk-vcodec/common/Makefile > > @@ -0,0 +1,8 @@ > > +obj-y += \ > > +venc_drv_if.o > > + > > +ccflags-y += \ > > +-I$(srctree)/include/ \ > > +-I$(srctree)/drivers/media/platform/mtk-vcodec \ > > +-I$(srctree)/drivers/media/platform/mtk-vcodec/include \ > > +-I$(srctree)/drivers/media/platform/mtk-vpu > > As above, this appears to be a directory to hold just one file. > Sorry, I didn't get it. Could you explain more? > > > diff --git a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c > b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c > > new file mode 100644 > > index 000..9b3f025 > > --- /dev/null > > +++ b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c > > @@ -0,0 +1,152 @@ > > +/* > > + * Copyright (c) 2015 MediaTek Inc. > > + * Author: Daniel Hsiao > > + * Jungchang Tsao > > + * > > + * This program is free software; you can redistribute it and/or > > + * modify > > + * it under the terms of the GNU General Public License version 2 as > > + * published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + */ > > + > > +#include > > +#include > > +#include > > + > > +#include "mtk_vcodec_drv.h" > > +#include "mtk_vcodec_enc.h" > > +#include &qu
Re: [RESEND RFC/PATCH 4/8] dt-bindings: Add a binding for Mediatek Video Encoder
Hi Rob,
On Tue, 2015-11-17 at 13:41 -0600, Rob Herring wrote:
> On Tue, Nov 17, 2015 at 08:54:41PM +0800, Tiffany Lin wrote:
> > add a DT binding documentation of Video Encoder for the
> > MT8173 SoC from Mediatek.
> >
> > Signed-off-by: Tiffany Lin
> > ---
> > .../devicetree/bindings/media/mediatek-vcodec.txt | 58
> >
> > 1 file changed, 58 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >
> > diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > new file mode 100644
> > index 000..fea4d7c
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > @@ -0,0 +1,58 @@
> > +Mediatek Video Codec
> > +
> > +Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
> > +supports high resolution encoding functionalities.
> > +
> > +Required properties:
> > +- compatible : "mediatek,mt8173-vcodec-enc" for encoder
> > +- reg : Physical base address of the video codec registers and length of
> > + memory mapped region.
> > +- interrupts : interrupt number to the cpu.
> > +- larb : must contain the larbes of current platform
>
> What is this?
Resend due to previous mail has html format and reject by some mail
servers.
This is SMI (Smart Multimedia Interface) Local Arbiter.
MT8173 has different local arbiters (larb).
Please see
http://lists.linuxfoundation.org/pipermail/iommu/2015-October/014587.html
Video Encoder HW has it's local arbiter (larb), by configure ports in
this larb, we can have encoder HW go through the m4u to talk with EMI.
We will change it to mediatek,larb in next version.
>
> > +- clocks : list of clock specifiers, corresponding to entries in
> > + the clock-names property;
> > +- clock-names: must contain "vencpll", "venc_lt_sel", "vcodecpll_370p5_ck"
> > +- iommus : list of iommus specifiers should be enabled for hw encode.
> > + There are 2 cells needed to enable/disable iommu.
> > + The first one is local arbiter index(larbid), and the other is port
> > + index(portid) within local arbiter. Specifies the larbid and portid
> > + as defined in dt-binding/memory/mt8173-larb-port.h.
> > +- vpu : the node of video processor unit
>
> This should be prefixed with mediatek.
We will prefix it with mediatek in next version.
>
> > +
> > +Example:
> > +vcodec_enc: vcodec@0x18002000 {
> > +compatible = "mediatek,mt8173-vcodec-enc";
> > +reg = <0 0x18002000 0 0x1000>,/*VENC_SYS*/
> > + <0 0x19002000 0 0x1000>;/*VENC_LT_SYS*/
> > +interrupts = ,
> > + ;
> > +larb = <&larb3>,
> > + <&larb5>;
> > +iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
> > + <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_FRM_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_SV_COMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_RD_COMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_LUMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_CHROMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_REF_LUMA_SET2>,
> > + <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_CHROMA_SET2>;
> > +vpu = <&vpu>;
> > +clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
> > + <&topckgen CLK_TOP_VENC_LT_SEL>,
> > + <&topckgen CLK_TOP_VCODECPLL_370P5>;
> > +clock-names = "vencpll",
> > + "venc_lt_sel",
> > + "vcodecpll_370p5_ck";
> > + };
> > --
> > 1.7.9.5
> >
best regards,
Tiffany
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[RESEND RFC/PATCH 5/8] arm64: dts: mediatek: Add Video Encoder for MT8173
add video encoder driver for MT8173
Signed-off-by: Tiffany Lin
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 47 ++
1 file changed, 47 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 098c15e..85ba167 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -545,6 +545,53 @@
#clock-cells = <1>;
};
+ larb3: larb@18001000 {
+ compatible = "mediatek,mt8173-smi-larb";
+ reg = <0 0x18001000 0 0x1000>;
+ mediatek,smi = <&smi_common>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_VENC>;
+ clocks = <&vencsys CLK_VENC_CKE1>,
+<&vencsys CLK_VENC_CKE0>;
+ clock-names = "apb", "smi";
+ };
+
+ vcodec_enc: vcodec@18002000 {
+ compatible = "mediatek,mt8173-vcodec-enc";
+ reg = <0 0x18002000 0 0x1000>, /* VENC_SYS */
+ <0 0x19002000 0 0x1000>; /* VENC_LT_SYS */
+ interrupts = ,
+;
+ larb = <&larb3>,
+ <&larb5>;
+ iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
+<&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
+<&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_REC_FRM_SET2>,
+<&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_SV_COMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_RD_COMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_CUR_LUMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_CUR_CHROMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_REF_LUMA_SET2>,
+<&iommu M4U_LARB5_ID
M4U_PORT_VENC_REC_CHROMA_SET2>;
+ vpu = <&vpu>;
+ clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
+<&topckgen CLK_TOP_VENC_LT_SEL>,
+<&topckgen CLK_TOP_VCODECPLL_370P5>;
+ clock-names = "vencpll",
+ "venc_lt_sel",
+ "vcodecpll_370p5_ck";
+ };
+
vencltsys: clock-controller@1900 {
compatible = "mediatek,mt8173-vencltsys", "syscon";
reg = <0 0x1900 0 0x1000>;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[RESEND RFC/PATCH 3/8] media: platform: mtk-vpu: Support Mediatek VPU
From: Andrew-CT Chen
The VPU driver for hw video codec embedded in Mediatek's MT8173 SOCs.
It is able to handle video decoding/encoding of in a range of formats.
The driver provides with VPU firmware download, memory management and
the communication interface between CPU and VPU.
For VPU initialization, it will create virtual memory for CPU access and
IOMMU address for vcodec hw device access. When a decode/encode instance
opens a device node, vpu driver will download vpu firmware to the device.
A decode/encode instant will decode/encode a frame using VPU
interface to interrupt vpu to handle decoding/encoding jobs.
Signed-off-by: Andrew-CT Chen
---
drivers/media/platform/Kconfig |6 +
drivers/media/platform/Makefile|2 +
drivers/media/platform/mtk-vpu/Makefile|1 +
.../platform/mtk-vpu/h264_enc/venc_h264_vpu.h | 127 +++
.../media/platform/mtk-vpu/include/venc_ipi_msg.h | 212 +
drivers/media/platform/mtk-vpu/mtk_vpu_core.c | 823
drivers/media/platform/mtk-vpu/mtk_vpu_core.h | 161
.../media/platform/mtk-vpu/vp8_enc/venc_vp8_vpu.h | 119 +++
8 files changed, 1451 insertions(+)
create mode 100644 drivers/media/platform/mtk-vpu/Makefile
create mode 100644 drivers/media/platform/mtk-vpu/h264_enc/venc_h264_vpu.h
create mode 100644 drivers/media/platform/mtk-vpu/include/venc_ipi_msg.h
create mode 100644 drivers/media/platform/mtk-vpu/mtk_vpu_core.c
create mode 100644 drivers/media/platform/mtk-vpu/mtk_vpu_core.h
create mode 100644 drivers/media/platform/mtk-vpu/vp8_enc/venc_vp8_vpu.h
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index ccbc974..f98eb47 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -148,6 +148,12 @@ config VIDEO_CODA
Coda is a range of video codec IPs that supports
H.264, MPEG-4, and other video formats.
+config MEDIATEK_VPU
+ bool "Mediatek Video Processor Unit"
+ ---help---
+ This driver provides downloading firmware vpu and
+ communicating with vpu.
+
config VIDEO_MEM2MEM_DEINTERLACE
tristate "Deinterlace support"
depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index efa0295..1b4c539 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -55,3 +55,5 @@ obj-$(CONFIG_VIDEO_AM437X_VPFE) += am437x/
obj-$(CONFIG_VIDEO_XILINX) += xilinx/
ccflags-y += -I$(srctree)/drivers/media/i2c
+
+obj-$(CONFIG_MEDIATEK_VPU) += mtk-vpu/
diff --git a/drivers/media/platform/mtk-vpu/Makefile
b/drivers/media/platform/mtk-vpu/Makefile
new file mode 100644
index 000..5de84d1
--- /dev/null
+++ b/drivers/media/platform/mtk-vpu/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MEDIATEK_VPU) += mtk_vpu_core.o
diff --git a/drivers/media/platform/mtk-vpu/h264_enc/venc_h264_vpu.h
b/drivers/media/platform/mtk-vpu/h264_enc/venc_h264_vpu.h
new file mode 100644
index 000..9c8ebdd
--- /dev/null
+++ b/drivers/media/platform/mtk-vpu/h264_enc/venc_h264_vpu.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Jungchang Tsao
+ * Daniel Hsiao
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef VENC_H264_VPU_H_
+#define VENC_H264_VPU_H_
+
+/**
+ * enum venc_h264_vpu_work_buf - h264 encoder buffer index
+ */
+enum venc_h264_vpu_work_buf {
+ VENC_H264_VPU_WORK_BUF_RC_INFO,
+ VENC_H264_VPU_WORK_BUF_RC_CODE,
+ VENC_H264_VPU_WORK_BUF_REC_LUMA,
+ VENC_H264_VPU_WORK_BUF_REC_CHROMA,
+ VENC_H264_VPU_WORK_BUF_REF_LUMA,
+ VENC_H264_VPU_WORK_BUF_REF_CHROMA,
+ VENC_H264_VPU_WORK_BUF_MV_INFO_1,
+ VENC_H264_VPU_WORK_BUF_MV_INFO_2,
+ VENC_H264_VPU_WORK_BUF_SKIP_FRAME,
+ VENC_H264_VPU_WORK_BUF_MAX,
+};
+
+/**
+ * enum venc_h264_bs_mode - for bs_mode argument in h264_enc_vpu_encode
+ */
+enum venc_h264_bs_mode {
+ H264_BS_MODE_SPS,
+ H264_BS_MODE_PPS,
+ H264_BS_MODE_FRAME,
+};
+
+/*
+ * struct venc_h264_vpu_config - Structure for h264 encoder configuration
+ * @input_fourcc: input fourcc
+ * @bitrate: target bitrate (in bps)
+ * @pic_w: picture width
+ * @pic_h: picture height
+ * @buf_w: buffer width
+ * @buf_h: buffer height
+ * @intra_period: intra frame period
+ * @framerate: frame rate
+ * @profile: as specified in standard
+ * @level: as specified in standard
+ * @wfd: WFD mode 1:on, 0:off
+ */
+struct venc_h264_vpu_config
[RESEND RFC/PATCH 0/8] Add MT8173 Video Encoder Driver and VPU Driver
== Introduction == The purpose of this RFC is to discuss the driver for a hw video codec embedded in the Mediatek's MT8173 SoCs. Mediatek Video Codec is able to handle video encoding of in a range of formats. This RFC also include VPU driver. Mediatek Video Codec driver rely on VPU driver to load, communicate with VPU. Internally the driver uses videobuf2 framework and MTK IOMMU and MTK SMI. MTK IOMMU and MTK SMI have not yet been merged, but we wanted to start discussion about the driver earlier so it could be merged sooner. The driver posted here is the initial version, so I suppose it will require more work. [1]http://lists.infradead.org/pipermail/linux-mediatek/2015-October/002525.html == Device interface == In principle the driver bases on memory-to-memory framework: it provides a single video node and each opened file handle gets its own private context with separate buffer queues. Each context consist of 2 buffer queues: OUTPUT (for source buffers, i.e. raw video frames) and CAPTURE (for destination buffers, i.e. encoded video frames). The process of encoding video data from stream is a bit more complicated than typical memory-to-memory processing. We base on memory-to-memory framework and add the complicated part in our vb2 and v4l2 callback functionss. So we can base on well done m2m memory-to-memory framework, reduce duplicate code and make our driver code simple. == VPU (Video Processor Unit) == The VPU driver for hw video codec embedded in Mediatek's MT8173 SOCs. It is able to handle video decoding/encoding of in a range of formats. The driver provides with VPU firmware download, memory management and the communication interface between CPU and VPU. For VPU initialization, it will create virtual memory for CPU access and IOMMU address for vcodec hw device access. When a decode/encode instance opens a device node, vpu driver will download vpu firmware to the device. A decode/encode instant will decode/encode a frame using VPU interface to interrupt vpu to handle decoding/encoding jobs. Please have a look at the code and comments will be very much appreciated. Andrew-CT Chen (3): dt-bindings: Add a binding for Mediatek Video Processor Unit arm64: dts: mediatek: Add node for Mediatek Video Processor Unit media: platform: mtk-vpu: Support Mediatek VPU Daniel Hsiao (1): media: platform: mtk-vcodec: Add Mediatek VP8 Video Encoder Driver Tiffany Lin (4): dt-bindings: Add a binding for Mediatek Video Encoder arm64: dts: mediatek: Add Video Encoder for MT8173 media: platform: mtk-vcodec: Add Mediatek V4L2 Video Encoder Driver media: platform: mtk-vcodec: Add Mediatek H264 Video Encoder Driver .../devicetree/bindings/media/mediatek-vcodec.txt | 58 + .../devicetree/bindings/media/mediatek-vpu.txt | 27 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 58 + drivers/media/platform/Kconfig | 19 + drivers/media/platform/Makefile|5 + drivers/media/platform/mtk-vcodec/Kconfig |5 + drivers/media/platform/mtk-vcodec/Makefile | 12 + drivers/media/platform/mtk-vcodec/common/Makefile | 12 + .../media/platform/mtk-vcodec/common/venc_drv_if.c | 159 ++ .../media/platform/mtk-vcodec/h264_enc/Makefile|9 + .../platform/mtk-vcodec/h264_enc/venc_h264_if.c| 529 ++ .../platform/mtk-vcodec/h264_enc/venc_h264_if.h| 53 + .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 341 .../platform/mtk-vcodec/include/venc_drv_base.h| 68 + .../platform/mtk-vcodec/include/venc_drv_if.h | 187 +++ .../platform/mtk-vcodec/include/venc_ipi_msg.h | 212 +++ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 441 + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1773 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 28 + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 535 ++ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 110 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 30 + drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 66 + drivers/media/platform/mtk-vcodec/vp8_enc/Makefile |9 + .../platform/mtk-vcodec/vp8_enc/venc_vp8_if.c | 371 .../platform/mtk-vcodec/vp8_enc/venc_vp8_if.h | 48 + .../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c | 245 +++ drivers/media/platform/mtk-vpu/Makefile|1 + .../platform/mtk-vpu/h264_enc/venc_h264_vpu.h | 127 ++ .../media/platform/mtk-vpu/include/venc_ipi_msg.h | 212 +++ drivers/media/platform/mtk-vpu/mtk_vpu_core.c | 823 + drivers/media/platform/mtk-vpu/mtk_vpu_core.h | 161 ++
[RESEND RFC/PATCH 4/8] dt-bindings: Add a binding for Mediatek Video Encoder
add a DT binding documentation of Video Encoder for the
MT8173 SoC from Mediatek.
Signed-off-by: Tiffany Lin
---
.../devicetree/bindings/media/mediatek-vcodec.txt | 58
1 file changed, 58 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-vcodec.txt
diff --git a/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
new file mode 100644
index 000..fea4d7c
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-vcodec.txt
@@ -0,0 +1,58 @@
+Mediatek Video Codec
+
+Mediatek Video Codec is the video codec hw present in Mediatek SoCs which
+supports high resolution encoding functionalities.
+
+Required properties:
+- compatible : "mediatek,mt8173-vcodec-enc" for encoder
+- reg : Physical base address of the video codec registers and length of
+ memory mapped region.
+- interrupts : interrupt number to the cpu.
+- larb : must contain the larbes of current platform
+- clocks : list of clock specifiers, corresponding to entries in
+ the clock-names property;
+- clock-names: must contain "vencpll", "venc_lt_sel", "vcodecpll_370p5_ck"
+- iommus : list of iommus specifiers should be enabled for hw encode.
+ There are 2 cells needed to enable/disable iommu.
+ The first one is local arbiter index(larbid), and the other is port
+ index(portid) within local arbiter. Specifies the larbid and portid
+ as defined in dt-binding/memory/mt8173-larb-port.h.
+- vpu : the node of video processor unit
+
+Example:
+vcodec_enc: vcodec@0x18002000 {
+compatible = "mediatek,mt8173-vcodec-enc";
+reg = <0 0x18002000 0 0x1000>,/*VENC_SYS*/
+ <0 0x19002000 0 0x1000>;/*VENC_LT_SYS*/
+interrupts = ,
+ ;
+larb = <&larb3>,
+ <&larb5>;
+iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_REC>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_BSDMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_SV_COMV>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_RD_COMV>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_LUMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_CUR_CHROMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_LUMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_REF_CHROMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_RDMA>,
+ <&iommu M4U_LARB3_ID M4U_PORT_VENC_NBM_WDMA>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_RCPU_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_FRM_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_BSDMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_SV_COMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_RD_COMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_LUMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_CUR_CHROMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_REF_LUMA_SET2>,
+ <&iommu M4U_LARB5_ID M4U_PORT_VENC_REC_CHROMA_SET2>;
+vpu = <&vpu>;
+clocks = <&apmixedsys CLK_APMIXED_VENCPLL>,
+ <&topckgen CLK_TOP_VENC_LT_SEL>,
+ <&topckgen CLK_TOP_VCODECPLL_370P5>;
+clock-names = "vencpll",
+ "venc_lt_sel",
+ "vcodecpll_370p5_ck";
+ };
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[RESEND RFC/PATCH 2/8] arm64: dts: mediatek: Add node for Mediatek Video Processor Unit
From: Andrew-CT Chen
add VPU drivers for MT8173
Signed-off-by: Andrew-CT Chen
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 11 +++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 4dd5f93..098c15e 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -258,6 +258,17 @@
clock-names = "spi", "wrap";
};
+ vpu: vpu@1002 {
+ compatible = "mediatek,mt8173-vpu";
+ reg = <0 0x1002 0 0x3>,
+ <0 0x1005 0 0x100>;
+ reg-names = "sram", "cfg_reg";
+ interrupts = ;
+ clocks = <&topckgen CLK_TOP_SCP_SEL>;
+ clock-names = "main";
+ iommus = <&iommu M4U_LARB3_ID M4U_PORT_VENC_RCPU>;
+ };
+
sysirq: intpol-controller@10200620 {
compatible = "mediatek,mt8173-sysirq",
"mediatek,mt6577-sysirq";
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[RESEND RFC/PATCH 6/8] media: platform: mtk-vcodec: Add Mediatek V4L2 Video Encoder Driver
Signed-off-by: Tiffany Lin Signed-off-by: Andrew-CT Chen --- drivers/media/platform/Kconfig | 13 + drivers/media/platform/Makefile|3 + drivers/media/platform/mtk-vcodec/Kconfig |5 + drivers/media/platform/mtk-vcodec/Makefile | 12 + drivers/media/platform/mtk-vcodec/common/Makefile |8 + .../media/platform/mtk-vcodec/common/venc_drv_if.c | 152 ++ .../platform/mtk-vcodec/include/venc_drv_base.h| 68 + .../platform/mtk-vcodec/include/venc_drv_if.h | 187 +++ .../platform/mtk-vcodec/include/venc_ipi_msg.h | 212 +++ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 441 + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1773 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 28 + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 535 ++ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 122 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.c| 110 ++ .../media/platform/mtk-vcodec/mtk_vcodec_intr.h| 30 + drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h | 26 + .../media/platform/mtk-vcodec/mtk_vcodec_util.c| 106 ++ .../media/platform/mtk-vcodec/mtk_vcodec_util.h| 66 + 19 files changed, 3897 insertions(+) create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig create mode 100644 drivers/media/platform/mtk-vcodec/Makefile create mode 100644 drivers/media/platform/mtk-vcodec/common/Makefile create mode 100644 drivers/media/platform/mtk-vcodec/common/venc_drv_if.c create mode 100644 drivers/media/platform/mtk-vcodec/include/venc_drv_base.h create mode 100644 drivers/media/platform/mtk-vcodec/include/venc_drv_if.h create mode 100644 drivers/media/platform/mtk-vcodec/include/venc_ipi_msg.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_pm.h create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f98eb47..b66cf1f 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -154,6 +154,19 @@ config MEDIATEK_VPU This driver provides downloading firmware vpu and communicating with vpu. +config VIDEO_MEDIATEK_VCODEC +tristate "Mediatek Video Codec driver" +depends on VIDEO_DEV && VIDEO_V4L2 +depends on ARCH_MEDIATEK || COMPILE_TEST +select VIDEOBUF2_DMA_CONTIG +select V4L2_MEM2MEM_DEV +select MEDIATEK_VPU +default n +---help--- +Mediatek video codec driver for V4L2 + +source "drivers/media/platform/mtk-vcodec/Kconfig" + config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 1b4c539..423b9f6 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -57,3 +57,6 @@ obj-$(CONFIG_VIDEO_XILINX)+= xilinx/ ccflags-y += -I$(srctree)/drivers/media/i2c obj-$(CONFIG_MEDIATEK_VPU) += mtk-vpu/ + +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC)+= mtk-vcodec/ + diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mtk-vcodec/Kconfig new file mode 100644 index 000..1c0b935 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Kconfig @@ -0,0 +1,5 @@ +config MEDIATEK_VPU + bool + ---help--- + This driver provides downloading firmware vpu (video processor unit) + and communicating with vpu. diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mtk-vcodec/Makefile new file mode 100644 index 000..c7f7174 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Makefile @@ -0,0 +1,12 @@ +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \ + mtk_vcodec_util.o \ + mtk_vcodec_enc_drv.o \ + mtk_vcodec_enc.o \ + mtk_vcodec_enc_pm.o + +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/ + +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vcodec/include \ +-I$(srctree)/drivers/media/platform/mtk-vcodec \ +-I$(srctree)/drive
[RESEND RFC/PATCH 8/8] media: platform: mtk-vcodec: Add Mediatek H264 Video Encoder Driver
Signed-off-by: Daniel Hsiao
---
drivers/media/platform/mtk-vcodec/Makefile |2 +-
drivers/media/platform/mtk-vcodec/common/Makefile |4 +-
.../media/platform/mtk-vcodec/common/venc_drv_if.c |3 +
.../media/platform/mtk-vcodec/h264_enc/Makefile|9 +
.../platform/mtk-vcodec/h264_enc/venc_h264_if.c| 529
.../platform/mtk-vcodec/h264_enc/venc_h264_if.h| 53 ++
.../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 341 +
7 files changed, 939 insertions(+), 2 deletions(-)
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/Makefile
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h
create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c
diff --git a/drivers/media/platform/mtk-vcodec/Makefile
b/drivers/media/platform/mtk-vcodec/Makefile
index b881a8b..d2189f7 100644
--- a/drivers/media/platform/mtk-vcodec/Makefile
+++ b/drivers/media/platform/mtk-vcodec/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
mtk_vcodec_enc.o \
mtk_vcodec_enc_pm.o
-obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/ vp8_enc/
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/ vp8_enc/ h264_enc/
ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vcodec/include \
-I$(srctree)/drivers/media/platform/mtk-vcodec \
diff --git a/drivers/media/platform/mtk-vcodec/common/Makefile
b/drivers/media/platform/mtk-vcodec/common/Makefile
index 71ae856..b33d48d 100644
--- a/drivers/media/platform/mtk-vcodec/common/Makefile
+++ b/drivers/media/platform/mtk-vcodec/common/Makefile
@@ -6,5 +6,7 @@ ccflags-y += \
-I$(srctree)/drivers/media/platform/mtk-vcodec \
-I$(srctree)/drivers/media/platform/mtk-vcodec/include \
-I$(srctree)/drivers/media/platform/mtk-vcodec/vp8_enc \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/h264_enc \
-I$(srctree)/drivers/media/platform/mtk-vpu \
--I$(srctree)/drivers/media/platform/mtk-vpu/vp8_enc
+-I$(srctree)/drivers/media/platform/mtk-vpu/vp8_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu/h264_enc
diff --git a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
index e9be186..930254b 100644
--- a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
@@ -27,6 +27,7 @@
#include "venc_drv_if.h"
#include "venc_drv_base.h"
#include "venc_vp8_if.h"
+#include "venc_h264_if.h"
int venc_if_create(void *ctx, unsigned int fourcc, unsigned long *handle)
{
@@ -48,6 +49,8 @@ int venc_if_create(void *ctx, unsigned int fourcc, unsigned
long *handle)
h->enc_if = get_vp8_enc_comm_if();
break;
case V4L2_PIX_FMT_H264:
+ h->enc_if = get_h264_enc_comm_if();
+ break;
default:
mtk_vcodec_err(h, "invalid format %s", str);
goto err_out;
diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
new file mode 100644
index 000..6559908
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
@@ -0,0 +1,9 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_h264_if.o venc_h264_vpu.o
+
+ccflags-y += \
+-I$(srctree)/include/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/include \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/h264_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu \
+-I$(srctree)/drivers/media/platform/mtk-vpu/h264_enc
diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
new file mode 100644
index 000..c880865
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
@@ -0,0 +1,529 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Jungchang Tsao
+ * Daniel Hsiao
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+
+#include "mtk_vcodec_drv.h"
+#include "mtk_vcodec_util.h"
+#include "mtk_vcodec_intr.h"
+#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_pm.h"
+#include "mtk_vpu_core.h"
+
+#include "venc_h264_if.h"
+#include "venc_h264_vpu.h"
+
+#define h264_write_reg(h, addr, val) writel(val, h->hw_base + addr)
+#define h264_read_
[RESEND RFC/PATCH 7/8] media: platform: mtk-vcodec: Add Mediatek VP8 Video Encoder Driver
From: Daniel Hsiao
Signed-off-by: Daniel Hsiao
---
drivers/media/platform/mtk-vcodec/Makefile |2 +-
drivers/media/platform/mtk-vcodec/common/Makefile |4 +-
.../media/platform/mtk-vcodec/common/venc_drv_if.c |6 +-
drivers/media/platform/mtk-vcodec/vp8_enc/Makefile |9 +
.../platform/mtk-vcodec/vp8_enc/venc_vp8_if.c | 371
.../platform/mtk-vcodec/vp8_enc/venc_vp8_if.h | 48 +++
.../platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c | 245 +
7 files changed, 682 insertions(+), 3 deletions(-)
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.h
create mode 100644 drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_vpu.c
diff --git a/drivers/media/platform/mtk-vcodec/Makefile
b/drivers/media/platform/mtk-vcodec/Makefile
index c7f7174..b881a8b 100644
--- a/drivers/media/platform/mtk-vcodec/Makefile
+++ b/drivers/media/platform/mtk-vcodec/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
mtk_vcodec_enc.o \
mtk_vcodec_enc_pm.o
-obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += common/ vp8_enc/
ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vcodec/include \
-I$(srctree)/drivers/media/platform/mtk-vcodec \
diff --git a/drivers/media/platform/mtk-vcodec/common/Makefile
b/drivers/media/platform/mtk-vcodec/common/Makefile
index 477ab80..71ae856 100644
--- a/drivers/media/platform/mtk-vcodec/common/Makefile
+++ b/drivers/media/platform/mtk-vcodec/common/Makefile
@@ -5,4 +5,6 @@ ccflags-y += \
-I$(srctree)/include/ \
-I$(srctree)/drivers/media/platform/mtk-vcodec \
-I$(srctree)/drivers/media/platform/mtk-vcodec/include \
--I$(srctree)/drivers/media/platform/mtk-vpu
\ No newline at end of file
+-I$(srctree)/drivers/media/platform/mtk-vcodec/vp8_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu \
+-I$(srctree)/drivers/media/platform/mtk-vpu/vp8_enc
diff --git a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
index 9b3f025..e9be186 100644
--- a/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/common/venc_drv_if.c
@@ -26,7 +26,7 @@
#include "venc_drv_if.h"
#include "venc_drv_base.h"
-
+#include "venc_vp8_if.h"
int venc_if_create(void *ctx, unsigned int fourcc, unsigned long *handle)
{
@@ -44,6 +44,10 @@ int venc_if_create(void *ctx, unsigned int fourcc, unsigned
long *handle)
mtk_vcodec_debug(h, "fmt = %s handle = %p", str, h);
switch (fourcc) {
+ case V4L2_PIX_FMT_VP8:
+ h->enc_if = get_vp8_enc_comm_if();
+ break;
+ case V4L2_PIX_FMT_H264:
default:
mtk_vcodec_err(h, "invalid format %s", str);
goto err_out;
diff --git a/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
b/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
new file mode 100644
index 000..ac78c33
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/vp8_enc/Makefile
@@ -0,0 +1,9 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_vp8_if.o venc_vp8_vpu.o
+
+ccflags-y += \
+-I$(srctree)/include/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/ \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/include \
+-I$(srctree)/drivers/media/platform/mtk-vcodec/vp8_enc \
+-I$(srctree)/drivers/media/platform/mtk-vpu/ \
+-I$(srctree)/drivers/media/platform/mtk-vpu/vp8_enc
diff --git a/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
b/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
new file mode 100644
index 000..cc6aaf4
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/vp8_enc/venc_vp8_if.c
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Daniel Hsiao
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include
+#include
+#include
+#include
+
+#include "mtk_vcodec_drv.h"
+#include "mtk_vcodec_util.h"
+#include "mtk_vcodec_intr.h"
+#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_pm.h"
+#include "mtk_vpu_core.h"
+
+#include "venc_vp8_if.h"
+#include "venc_vp8_vpu.h"
+
+#define vp8_enc_write_reg(h, addr, val)writel(val, h->hw_base + addr)
+#define vp8_enc_read_reg(h, addr) readl(h->hw_base + addr)
+
+#define VENC_PIC_BITSTREAM_BYTE_C
[RESEND RFC/PATCH 1/8] dt-bindings: Add a binding for Mediatek Video Processor Unit
From: Andrew-CT Chen
Add a DT binding documentation of Video Processor Unit for the
MT8173 SoC from Mediatek.
Signed-off-by: Andrew-CT Chen
---
.../devicetree/bindings/media/mediatek-vpu.txt | 27
1 file changed, 27 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-vpu.txt
diff --git a/Documentation/devicetree/bindings/media/mediatek-vpu.txt
b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
new file mode 100644
index 000..99a4e5e
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
@@ -0,0 +1,27 @@
+* Mediatek Video Processor Unit
+
+Video Processor Unit is a HW video controller. It controls HW Codec including
+H.264/VP8/VP9 Decode, H.264/VP8 Encode and Image Processor (scale/rotate/color
convert).
+
+Required properties:
+ - compatible: "mediatek,mt8173-vpu"
+ - reg: Must contain an entry for each entry in reg-names.
+ - reg-names: Must include the following entries:
+"sram": SRAM base
+"cfg_reg": Main configuration registers base
+ - interrupts: interrupt number to the cpu.
+ - clocks : clock name from clock manager
+ - clock-names: the clocks of the VPU H/W
+ - iommus : phandle and IOMMU spcifier for the IOMMU that serves the VPU.
+
+Example:
+ vpu: vpu@1002 {
+ compatible = "mediatek,mt8173-vpu";
+ reg = <0 0x1002 0 0x3>,
+ <0 0x1005 0 0x100>;
+ reg-names = "sram", "cfg_reg";
+ interrupts = ;
+ clocks = <&topckgen TOP_SCP_SEL>;
+ clock-names = "main";
+ iommus = <&iommu M4U_PORT_VENC_RCPU>;
+ };
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
