Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1472459 > unrolled thread
| Started by | Minghsiu Tsai <minghsiu.tsai@mediatek.com> |
|---|---|
| First post | 2016-08-30 14:30 +0200 |
| Last post | 2016-09-08 08:50 +0200 |
| Articles | 5 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v5 0/5] Add MT8173 MDP Driver Minghsiu Tsai <minghsiu.tsai@mediatek.com> - 2016-08-30 14:30 +0200
[PATCH v5 4/5] arm64: dts: mediatek: Add MDP for MT8173 Minghsiu Tsai <minghsiu.tsai@mediatek.com> - 2016-08-30 14:30 +0200
Re: [PATCH v5 3/5] media: Add Mediatek MDP Driver Hans Verkuil <hverkuil@xs4all.nl> - 2016-09-05 12:20 +0200
Re: [PATCH v5 3/5] media: Add Mediatek MDP Driver Minghsiu Tsai <minghsiu.tsai@mediatek.com> - 2016-09-08 14:30 +0200
Re: [PATCH v5 0/5] Add MT8173 MDP Driver Hans Verkuil <hverkuil@xs4all.nl> - 2016-09-08 08:50 +0200
| From | Minghsiu Tsai <minghsiu.tsai@mediatek.com> |
|---|---|
| Date | 2016-08-30 14:30 +0200 |
| Subject | [PATCH v5 0/5] Add MT8173 MDP Driver |
| Message-ID | <sbQkV-4K2-5@gated-at.bofh.it> |
Changes in v5:
- Add ack in the comment of dts patch
- Fix s/g_selection()
- Separate format V4L2_PIX_FMT_MT21C into new patch
Changes in v4:
- Add "depends on HAS_DMA" in Kconfig.
- Fix s/g_selection()
- Replace struct v4l2_crop with u32 and struct v4l2_rect
- Remove VB2_USERPTR
- Move mutex lock after ctx allocation in mtk_mdp_m2m_open()
- Add new format V4L2_PIX_FMT_YVU420 to support software on Android platform.
- Only width/height of image in format V4L2_PIX_FMT_MT21 is aligned to 16/16,
other ones are aligned to 2/2 by default
Changes in v3:
- Modify device ndoe as structured one.
- Fix conflict in dts on Linux 4.8-rc1
Changes in v2:
- Add section to describe blocks function in dts-bindings
- Remove the assignment of device_caps in querycap()
- Remove format's name assignment
- Copy colorspace-related parameters from OUTPUT to CAPTURE
- Use m2m helper functions
- Fix DMA allocation failure
- Initialize lazily vpu instance in streamon()
==============
Introduction
==============
The purpose of this series is to add the driver for Media Data Path HW embedded in the Mediatek's MT8173 SoC.
MDP is used for scaling and color space conversion.
It could convert V4L2_PIX_FMT_MT21 to V4L2_PIX_FMT_NV12M or V4L2_PIX_FMT_YUV420M.
NV12M/YUV420M/MT21 -> MDP -> NV12M/YUV420M
This patch series rely on MTK VPU driver in patch series "Add MT8173 Video Encoder Driver and VPU Driver"[1] and "Add MT8173 Video Decoder Driver"[2].
MDP driver rely on VPU driver to load, communicate with VPU.
Internally the driver uses videobuf2 framework and MTK IOMMU and MTK SMI both have been merged in v4.6-rc1.
[1]https://patchwork.kernel.org/patch/9002171/
[2]https://patchwork.kernel.org/patch/9141245/
==================
Device interface
==================
In principle the driver bases on v4l2 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) and CAPTURE (for destination buffers).
OUTPUT and CAPTURE buffer could be MMAP or DMABUF memory type.
v4l2-compliance test output:
# v4l2-compliance -d /dev/image-proc0
v4l2-compliance SHA : a737a6161485fffb70bf51e4fd7f6e2d910174c1
Driver Info:
Driver name : mtk-mdp
Card type : soc:mdp
Bus info : platform:mt8173
Driver version: 4.8.0
Capabilities : 0x84204000
Video Memory-to-Memory Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar
Streaming
Extended Pix Format
Compliance test for device /dev/image-proc0 (not using libv4l2):
Required ioctls:
test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second video open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 5 Private Controls: 0
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)
test Cropping: OK
test Composing: OK
test Scaling: OK
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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
test VIDIOC_EXPBUF: OK
Test input 0:
Total: 43, Succeeded: 43, Failed: 0, Warnings: 0
Minghsiu Tsai (5):
VPU: mediatek: Add mdp support
dt-bindings: Add a binding for Mediatek MDP
media: Add Mediatek MDP Driver
arm64: dts: mediatek: Add MDP for MT8173
media: mtk-mdp: support pixelformat V4L2_PIX_FMT_MT21C
.../devicetree/bindings/media/mediatek-mdp.txt | 109 ++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 84 ++
drivers/media/platform/Kconfig | 17 +
drivers/media/platform/Makefile | 2 +
drivers/media/platform/mtk-mdp/Makefile | 9 +
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 159 +++
drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 72 ++
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 294 +++++
drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 260 ++++
drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 126 ++
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 1278 ++++++++++++++++++++
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h | 22 +
drivers/media/platform/mtk-mdp/mtk_mdp_regs.c | 156 +++
drivers/media/platform/mtk-mdp/mtk_mdp_regs.h | 31 +
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 145 +++
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h | 41 +
drivers/media/platform/mtk-vpu/mtk_vpu.h | 5 +
17 files changed, 2810 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-mdp.txt
create mode 100644 drivers/media/platform/mtk-mdp/Makefile
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.c
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.h
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
--
1.7.9.5
[toc] | [next] | [standalone]
| From | Minghsiu Tsai <minghsiu.tsai@mediatek.com> |
|---|---|
| Date | 2016-08-30 14:30 +0200 |
| Subject | [PATCH v5 4/5] arm64: dts: mediatek: Add MDP for MT8173 |
| Message-ID | <sbQkW-4K2-33@gated-at.bofh.it> |
| In reply to | #1472459 |
Add MDP node for MT8173
Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 84 ++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 10f638f..cd93228 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -41,6 +41,14 @@
dpi0 = &dpi0;
dsi0 = &dsi0;
dsi1 = &dsi1;
+ mdp_rdma0 = &mdp_rdma0;
+ mdp_rdma1 = &mdp_rdma1;
+ mdp_rsz0 = &mdp_rsz0;
+ mdp_rsz1 = &mdp_rsz1;
+ mdp_rsz2 = &mdp_rsz2;
+ mdp_wdma0 = &mdp_wdma0;
+ mdp_wrot0 = &mdp_wrot0;
+ mdp_wrot1 = &mdp_wrot1;
};
cpus {
@@ -716,6 +724,82 @@
#clock-cells = <1>;
};
+ mdp {
+ compatible = "mediatek,mt8173-mdp";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ mediatek,vpu = <&vpu>;
+
+ mdp_rdma0: rdma@14001000 {
+ compatible = "mediatek,mt8173-mdp-rdma";
+ reg = <0 0x14001000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_RDMA0>,
+ <&mmsys CLK_MM_MUTEX_32K>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ iommus = <&iommu M4U_PORT_MDP_RDMA0>;
+ mediatek,larb = <&larb0>;
+ };
+
+ mdp_rdma1: rdma@14002000 {
+ compatible = "mediatek,mt8173-mdp-rdma";
+ reg = <0 0x14002000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_RDMA1>,
+ <&mmsys CLK_MM_MUTEX_32K>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ iommus = <&iommu M4U_PORT_MDP_RDMA1>;
+ mediatek,larb = <&larb4>;
+ };
+
+ mdp_rsz0: rsz@14003000 {
+ compatible = "mediatek,mt8173-mdp-rsz";
+ reg = <0 0x14003000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_RSZ0>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ };
+
+ mdp_rsz1: rsz@14004000 {
+ compatible = "mediatek,mt8173-mdp-rsz";
+ reg = <0 0x14004000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_RSZ1>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ };
+
+ mdp_rsz2: rsz@14005000 {
+ compatible = "mediatek,mt8173-mdp-rsz";
+ reg = <0 0x14005000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_RSZ2>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ };
+
+ mdp_wdma0: wdma@14006000 {
+ compatible = "mediatek,mt8173-mdp-wdma";
+ reg = <0 0x14006000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_WDMA>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ iommus = <&iommu M4U_PORT_MDP_WDMA>;
+ mediatek,larb = <&larb0>;
+ };
+
+ mdp_wrot0: wrot@14007000 {
+ compatible = "mediatek,mt8173-mdp-wrot";
+ reg = <0 0x14007000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_WROT0>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ iommus = <&iommu M4U_PORT_MDP_WROT0>;
+ mediatek,larb = <&larb0>;
+ };
+
+ mdp_wrot1: wrot@14008000 {
+ compatible = "mediatek,mt8173-mdp-wrot";
+ reg = <0 0x14008000 0 0x1000>;
+ clocks = <&mmsys CLK_MM_MDP_WROT1>;
+ power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+ iommus = <&iommu M4U_PORT_MDP_WROT1>;
+ mediatek,larb = <&larb4>;
+ };
+ };
+
ovl0: ovl@1400c000 {
compatible = "mediatek,mt8173-disp-ovl";
reg = <0 0x1400c000 0 0x1000>;
--
1.7.9.5
[toc] | [prev] | [next] | [standalone]
| From | Hans Verkuil <hverkuil@xs4all.nl> |
|---|---|
| Date | 2016-09-05 12:20 +0200 |
| Subject | Re: [PATCH v5 3/5] media: Add Mediatek MDP Driver |
| Message-ID | <sdZaq-2o0-21@gated-at.bofh.it> |
| In reply to | #1472459 |
On 08/30/2016 02:25 PM, Minghsiu Tsai wrote:
> Add MDP driver for MT8173
>
> Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
> ---
> drivers/media/platform/Kconfig | 17 +
> drivers/media/platform/Makefile | 2 +
> drivers/media/platform/mtk-mdp/Makefile | 9 +
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 159 ++++
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 72 ++
> drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 294 ++++++
> drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 260 +++++
> drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 126 +++
> drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 1270 +++++++++++++++++++++++++
> drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h | 22 +
> drivers/media/platform/mtk-mdp/mtk_mdp_regs.c | 152 +++
> drivers/media/platform/mtk-mdp/mtk_mdp_regs.h | 31 +
> drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 145 +++
> drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h | 41 +
> 14 files changed, 2600 insertions(+)
> create mode 100644 drivers/media/platform/mtk-mdp/Makefile
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.h
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
> create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
>
<snip>
> +static inline bool mtk_mdp_is_target_compose(u32 target)
> +{
> + if (target == V4L2_SEL_TGT_COMPOSE_DEFAULT
> + || target == V4L2_SEL_TGT_COMPOSE_BOUNDS
> + || target == V4L2_SEL_TGT_COMPOSE)
> + return true;
> + return false;
> +}
> +
> +static inline bool mtk_mdp_is_target_crop(u32 target)
> +{
> + if (target == V4L2_SEL_TGT_CROP_DEFAULT
> + || target == V4L2_SEL_TGT_CROP_BOUNDS
> + || target == V4L2_SEL_TGT_CROP)
> + return true;
> + return false;
> +}
> +
> +static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
> + struct v4l2_selection *s)
> +{
> + struct mtk_mdp_frame *frame;
> + struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
> + bool valid = false;
> +
> + if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> + if (mtk_mdp_is_target_compose(s->target))
> + valid = true;
> + } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> + if (mtk_mdp_is_target_crop(s->target))
> + valid = true;
> + }
> + if (!valid) {
> + mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> + s->target);
> + return -EINVAL;
> + }
> +
> + frame = mtk_mdp_ctx_get_frame(ctx, s->type);
> +
> + switch (s->target) {
> + case V4L2_SEL_TGT_COMPOSE_DEFAULT:
> + case V4L2_SEL_TGT_COMPOSE_BOUNDS:
> + case V4L2_SEL_TGT_CROP_BOUNDS:
> + case V4L2_SEL_TGT_CROP_DEFAULT:
> + s->r.left = 0;
> + s->r.top = 0;
> + s->r.width = frame->width;
> + s->r.height = frame->height;
> + return 0;
> +
> + case V4L2_SEL_TGT_COMPOSE:
> + case V4L2_SEL_TGT_CROP:
> + s->r.left = frame->crop.left;
> + s->r.top = frame->crop.top;
> + s->r.width = frame->crop.width;
> + s->r.height = frame->crop.height;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +
> +static int mtk_mdp_check_scaler_ratio(struct mtk_mdp_variant *var, int src_w,
> + int src_h, int dst_w, int dst_h, int rot)
> +{
> + int tmp_w, tmp_h;
> +
> + if (rot == 90 || rot == 270) {
> + tmp_w = dst_h;
> + tmp_h = dst_w;
> + } else {
> + tmp_w = dst_w;
> + tmp_h = dst_h;
> + }
> +
> + if ((src_w / tmp_w) > var->h_scale_down_max ||
> + (src_h / tmp_h) > var->v_scale_down_max ||
> + (tmp_w / src_w) > var->h_scale_up_max ||
> + (tmp_h / src_h) > var->v_scale_up_max)
> + return -EINVAL;
> +
> + return 0;
> +}
> +
> +static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
> + struct v4l2_selection *s)
> +{
> + struct mtk_mdp_frame *frame;
> + struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
> + struct v4l2_rect new_r;
> + struct mtk_mdp_variant *variant = ctx->mdp_dev->variant;
> + int ret;
> + bool valid = false;
> +
> + if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> + if (mtk_mdp_is_target_compose(s->target))
> + valid = true;
> + } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> + if (mtk_mdp_is_target_crop(s->target))
> + valid = true;
> + }
These tests are wrong: you can't set the _DEFAULT and _BOUNDS targets.
Those are read-only. It's easiest to just explicitly check for _CROP or
_COMPOSE here.
I've added a check to v4l2-compliance to test for this.
> + if (!valid) {
> + mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> + s->target);
> + return -EINVAL;
> + }
> +
> + new_r = s->r;
> + ret = mtk_mdp_try_crop(ctx, s->type, &new_r);
> + if (ret)
> + return ret;
> +
> + if (mtk_mdp_is_target_crop(s->target))
> + frame = &ctx->s_frame;
> + else
> + frame = &ctx->d_frame;
> +
> + /* Check to see if scaling ratio is within supported range */
> + if (mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_DST_FMT | MTK_MDP_SRC_FMT)) {
> + if (V4L2_TYPE_IS_OUTPUT(s->type)) {
> + ret = mtk_mdp_check_scaler_ratio(variant, new_r.width,
> + new_r.height, ctx->d_frame.crop.width,
> + ctx->d_frame.crop.height,
> + ctx->ctrls.rotate->val);
> + } else {
> + ret = mtk_mdp_check_scaler_ratio(variant,
> + ctx->s_frame.crop.width,
> + ctx->s_frame.crop.height, new_r.width,
> + new_r.height, ctx->ctrls.rotate->val);
> + }
> +
> + if (ret) {
> + dev_info(&ctx->mdp_dev->pdev->dev,
> + "Out of scaler range");
> + return -EINVAL;
> + }
> + }
> +
> + s->r = new_r;
> + frame->crop = new_r;
> +
> + return 0;
> +}
Regards,
Hans
[toc] | [prev] | [next] | [standalone]
| From | Minghsiu Tsai <minghsiu.tsai@mediatek.com> |
|---|---|
| Date | 2016-09-08 14:30 +0200 |
| Subject | Re: [PATCH v5 3/5] media: Add Mediatek MDP Driver |
| Message-ID | <sf6CR-5Lv-15@gated-at.bofh.it> |
| In reply to | #1476280 |
On Mon, 2016-09-05 at 12:17 +0200, Hans Verkuil wrote:
> On 08/30/2016 02:25 PM, Minghsiu Tsai wrote:
> > Add MDP driver for MT8173
> >
> > Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
> > ---
> > drivers/media/platform/Kconfig | 17 +
> > drivers/media/platform/Makefile | 2 +
> > drivers/media/platform/mtk-mdp/Makefile | 9 +
> > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 159 ++++
> > drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 72 ++
> > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 294 ++++++
> > drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 260 +++++
> > drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 126 +++
> > drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 1270 +++++++++++++++++++++++++
> > drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h | 22 +
> > drivers/media/platform/mtk-mdp/mtk_mdp_regs.c | 152 +++
> > drivers/media/platform/mtk-mdp/mtk_mdp_regs.h | 31 +
> > drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 145 +++
> > drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h | 41 +
> > 14 files changed, 2600 insertions(+)
> > create mode 100644 drivers/media/platform/mtk-mdp/Makefile
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.h
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
> > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
> >
>
> <snip>
>
> > +static inline bool mtk_mdp_is_target_compose(u32 target)
> > +{
> > + if (target == V4L2_SEL_TGT_COMPOSE_DEFAULT
> > + || target == V4L2_SEL_TGT_COMPOSE_BOUNDS
> > + || target == V4L2_SEL_TGT_COMPOSE)
> > + return true;
> > + return false;
> > +}
> > +
> > +static inline bool mtk_mdp_is_target_crop(u32 target)
> > +{
> > + if (target == V4L2_SEL_TGT_CROP_DEFAULT
> > + || target == V4L2_SEL_TGT_CROP_BOUNDS
> > + || target == V4L2_SEL_TGT_CROP)
> > + return true;
> > + return false;
> > +}
> > +
> > +static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
> > + struct v4l2_selection *s)
> > +{
> > + struct mtk_mdp_frame *frame;
> > + struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
> > + bool valid = false;
> > +
> > + if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> > + if (mtk_mdp_is_target_compose(s->target))
> > + valid = true;
> > + } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> > + if (mtk_mdp_is_target_crop(s->target))
> > + valid = true;
> > + }
> > + if (!valid) {
> > + mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> > + s->target);
> > + return -EINVAL;
> > + }
> > +
> > + frame = mtk_mdp_ctx_get_frame(ctx, s->type);
> > +
> > + switch (s->target) {
> > + case V4L2_SEL_TGT_COMPOSE_DEFAULT:
> > + case V4L2_SEL_TGT_COMPOSE_BOUNDS:
> > + case V4L2_SEL_TGT_CROP_BOUNDS:
> > + case V4L2_SEL_TGT_CROP_DEFAULT:
> > + s->r.left = 0;
> > + s->r.top = 0;
> > + s->r.width = frame->width;
> > + s->r.height = frame->height;
> > + return 0;
> > +
> > + case V4L2_SEL_TGT_COMPOSE:
> > + case V4L2_SEL_TGT_CROP:
> > + s->r.left = frame->crop.left;
> > + s->r.top = frame->crop.top;
> > + s->r.width = frame->crop.width;
> > + s->r.height = frame->crop.height;
> > + return 0;
> > + }
> > +
> > + return -EINVAL;
> > +}
> > +
> > +static int mtk_mdp_check_scaler_ratio(struct mtk_mdp_variant *var, int src_w,
> > + int src_h, int dst_w, int dst_h, int rot)
> > +{
> > + int tmp_w, tmp_h;
> > +
> > + if (rot == 90 || rot == 270) {
> > + tmp_w = dst_h;
> > + tmp_h = dst_w;
> > + } else {
> > + tmp_w = dst_w;
> > + tmp_h = dst_h;
> > + }
> > +
> > + if ((src_w / tmp_w) > var->h_scale_down_max ||
> > + (src_h / tmp_h) > var->v_scale_down_max ||
> > + (tmp_w / src_w) > var->h_scale_up_max ||
> > + (tmp_h / src_h) > var->v_scale_up_max)
> > + return -EINVAL;
> > +
> > + return 0;
> > +}
> > +
> > +static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
> > + struct v4l2_selection *s)
> > +{
> > + struct mtk_mdp_frame *frame;
> > + struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
> > + struct v4l2_rect new_r;
> > + struct mtk_mdp_variant *variant = ctx->mdp_dev->variant;
> > + int ret;
> > + bool valid = false;
> > +
> > + if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> > + if (mtk_mdp_is_target_compose(s->target))
> > + valid = true;
> > + } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> > + if (mtk_mdp_is_target_crop(s->target))
> > + valid = true;
> > + }
>
> These tests are wrong: you can't set the _DEFAULT and _BOUNDS targets.
> Those are read-only. It's easiest to just explicitly check for _CROP or
> _COMPOSE here.
>
> I've added a check to v4l2-compliance to test for this.
>
I will fix it in v6 and test with the latest v4l2-compliance. Thanks.
> > + if (!valid) {
> > + mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> > + s->target);
> > + return -EINVAL;
> > + }
> > +
> > + new_r = s->r;
> > + ret = mtk_mdp_try_crop(ctx, s->type, &new_r);
> > + if (ret)
> > + return ret;
> > +
> > + if (mtk_mdp_is_target_crop(s->target))
> > + frame = &ctx->s_frame;
> > + else
> > + frame = &ctx->d_frame;
> > +
> > + /* Check to see if scaling ratio is within supported range */
> > + if (mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_DST_FMT | MTK_MDP_SRC_FMT)) {
> > + if (V4L2_TYPE_IS_OUTPUT(s->type)) {
> > + ret = mtk_mdp_check_scaler_ratio(variant, new_r.width,
> > + new_r.height, ctx->d_frame.crop.width,
> > + ctx->d_frame.crop.height,
> > + ctx->ctrls.rotate->val);
> > + } else {
> > + ret = mtk_mdp_check_scaler_ratio(variant,
> > + ctx->s_frame.crop.width,
> > + ctx->s_frame.crop.height, new_r.width,
> > + new_r.height, ctx->ctrls.rotate->val);
> > + }
> > +
> > + if (ret) {
> > + dev_info(&ctx->mdp_dev->pdev->dev,
> > + "Out of scaler range");
> > + return -EINVAL;
> > + }
> > + }
> > +
> > + s->r = new_r;
> > + frame->crop = new_r;
> > +
> > + return 0;
> > +}
>
>
> Regards,
>
> Hans
[toc] | [prev] | [next] | [standalone]
| From | Hans Verkuil <hverkuil@xs4all.nl> |
|---|---|
| Date | 2016-09-08 08:50 +0200 |
| Message-ID | <sf1jP-2jn-7@gated-at.bofh.it> |
| In reply to | #1472459 |
FYI: I'm missing a MAINTAINERS entry for this driver. Please add one when you post v6. Thanks! Hans On 08/30/2016 02:25 PM, Minghsiu Tsai wrote: > Changes in v5: > - Add ack in the comment of dts patch > - Fix s/g_selection() > - Separate format V4L2_PIX_FMT_MT21C into new patch > > Changes in v4: > - Add "depends on HAS_DMA" in Kconfig. > - Fix s/g_selection() > - Replace struct v4l2_crop with u32 and struct v4l2_rect > - Remove VB2_USERPTR > - Move mutex lock after ctx allocation in mtk_mdp_m2m_open() > - Add new format V4L2_PIX_FMT_YVU420 to support software on Android platform. > - Only width/height of image in format V4L2_PIX_FMT_MT21 is aligned to 16/16, > other ones are aligned to 2/2 by default > > Changes in v3: > - Modify device ndoe as structured one. > - Fix conflict in dts on Linux 4.8-rc1 > > Changes in v2: > - Add section to describe blocks function in dts-bindings > - Remove the assignment of device_caps in querycap() > - Remove format's name assignment > - Copy colorspace-related parameters from OUTPUT to CAPTURE > - Use m2m helper functions > - Fix DMA allocation failure > - Initialize lazily vpu instance in streamon() > > ============== > Introduction > ============== > > The purpose of this series is to add the driver for Media Data Path HW embedded in the Mediatek's MT8173 SoC. > MDP is used for scaling and color space conversion. > > It could convert V4L2_PIX_FMT_MT21 to V4L2_PIX_FMT_NV12M or V4L2_PIX_FMT_YUV420M. > > NV12M/YUV420M/MT21 -> MDP -> NV12M/YUV420M > > This patch series rely on MTK VPU driver in patch series "Add MT8173 Video Encoder Driver and VPU Driver"[1] and "Add MT8173 Video Decoder Driver"[2]. > MDP driver rely on VPU driver to load, communicate with VPU. > > Internally the driver uses videobuf2 framework and MTK IOMMU and MTK SMI both have been merged in v4.6-rc1. > > [1]https://patchwork.kernel.org/patch/9002171/ > [2]https://patchwork.kernel.org/patch/9141245/ > > ================== > Device interface > ================== > > In principle the driver bases on v4l2 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) and CAPTURE (for destination buffers). > OUTPUT and CAPTURE buffer could be MMAP or DMABUF memory type. > > v4l2-compliance test output: > # v4l2-compliance -d /dev/image-proc0 > v4l2-compliance SHA : a737a6161485fffb70bf51e4fd7f6e2d910174c1 > > Driver Info: > Driver name : mtk-mdp > Card type : soc:mdp > Bus info : platform:mt8173 > Driver version: 4.8.0 > Capabilities : 0x84204000 > Video Memory-to-Memory Multiplanar > Streaming > Extended Pix Format > Device Capabilities > Device Caps : 0x04204000 > Video Memory-to-Memory Multiplanar > Streaming > Extended Pix Format > > Compliance test for device /dev/image-proc0 (not using libv4l2): > > Required ioctls: > test VIDIOC_QUERYCAP: OK > > Allow for multiple opens: > test second video open: OK > test VIDIOC_QUERYCAP: OK > test VIDIOC_G/S_PRIORITY: OK > test for unlimited opens: OK > > Debug ioctls: > test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) > test VIDIOC_LOG_STATUS: OK (Not Supported) > > Input ioctls: > test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) > test VIDIOC_G/S_FREQUENCY: OK (Not Supported) > test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) > test VIDIOC_ENUMAUDIO: OK (Not Supported) > test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) > test VIDIOC_G/S_AUDIO: OK (Not Supported) > Inputs: 0 Audio Inputs: 0 Tuners: 0 > > Output ioctls: > test VIDIOC_G/S_MODULATOR: OK (Not Supported) > test VIDIOC_G/S_FREQUENCY: OK (Not Supported) > test VIDIOC_ENUMAUDOUT: OK (Not Supported) > test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) > test VIDIOC_G/S_AUDOUT: OK (Not Supported) > Outputs: 0 Audio Outputs: 0 Modulators: 0 > > Input/Output configuration ioctls: > test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) > test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) > test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) > test VIDIOC_G/S_EDID: OK (Not Supported) > > Control ioctls: > test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK > test VIDIOC_QUERYCTRL: OK > test VIDIOC_G/S_CTRL: OK > test VIDIOC_G/S/TRY_EXT_CTRLS: OK > test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK > test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) > Standard Controls: 5 Private Controls: 0 > > 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) > test Cropping: OK > test Composing: OK > test Scaling: OK > > 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: > test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK > test VIDIOC_EXPBUF: OK > > Test input 0: > > > Total: 43, Succeeded: 43, Failed: 0, Warnings: 0 > > > Minghsiu Tsai (5): > VPU: mediatek: Add mdp support > dt-bindings: Add a binding for Mediatek MDP > media: Add Mediatek MDP Driver > arm64: dts: mediatek: Add MDP for MT8173 > media: mtk-mdp: support pixelformat V4L2_PIX_FMT_MT21C > > .../devicetree/bindings/media/mediatek-mdp.txt | 109 ++ > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 84 ++ > drivers/media/platform/Kconfig | 17 + > drivers/media/platform/Makefile | 2 + > drivers/media/platform/mtk-mdp/Makefile | 9 + > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 159 +++ > drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 72 ++ > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 294 +++++ > drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 260 ++++ > drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 126 ++ > drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 1278 ++++++++++++++++++++ > drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h | 22 + > drivers/media/platform/mtk-mdp/mtk_mdp_regs.c | 156 +++ > drivers/media/platform/mtk-mdp/mtk_mdp_regs.h | 31 + > drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 145 +++ > drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h | 41 + > drivers/media/platform/mtk-vpu/mtk_vpu.h | 5 + > 17 files changed, 2810 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/mediatek-mdp.txt > create mode 100644 drivers/media/platform/mtk-mdp/Makefile > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.c > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_core.h > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.c > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_regs.h > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c > create mode 100644 drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h >
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web