Message ID | 20230208090855.18934-1-moudy.ho@mediatek.com (mailing list archive) |
---|---|
Headers | show |
Series | Add support for multiple chips | expand |
Hi Moudy, On 08/02/2023 10:08, Moudy Ho wrote: > Changes since v5: > - Rebase on linux-next. > - Integrate the chip configuration into a source file called "mdp_cfg_data.c" > instead of a header file. > - Fix undefined reference to __udividi3 caused by patch [1/12]. > - Fix parentheses issue reported by check script. > - Fix compilation and smatch errors > > Changes since v4: > - Rebase on linux-next. > - Fix potential frame size overflow in "mtk-mdp3-regs.c". > - Fix OOB in MDP3 component clocks in "mtk-mdp3-comp.*". > - Reconfigure the shared memory between MDP3 kerenl and SCP. > > Changes since v3: > - Rebase on linux-next. > - In the file "mtk-mdp3-m2m.c", use the limited resolution defined by > each platform to replace the default format. > - Add platform ID in driver data, and refine shared memory structure preprocessing. > - Simplify the way to get mutex ID in function "mdp_path_subfrm_require". > > Changes since v2: > - Depend on : > [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=687004 > - Split the shared memory header(mtk-img-ipi.h) by preprocessing instead, and > classify the generic parts into "mtk-mdp3-type.h", and move > chip-specific parts to"mt8183/mdp3-comp-mt8183.h". > > Changes since v1: > - Depend on : > [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=687004 > - For hardware-specific structures in the shared memory header(mtk-img-ipi.h), > split the relevant functions and structure definitions. > > Hi, > > To support multiple chips, a chip configuration header file needs to be created > and the relevant information split and moved into it. This series is close to be ready for merging. Two issues: please rebase again to the latest media_stage tree https://git.linuxtv.org/media_stage.git/ I had a number of conflicts, and I didn't feel comfortable to make the changes myself, it wasn't trivial. Secondly, I get a smatch error: drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c:452 mdp_cfg_get_id_public() error: 'mdp_dev' dereferencing possible ERR_PTR() In any case, if you can rebase and fix that issue, then I'll make a PR. Thanks! Hans > The v4l2-compliance test results list is as follows: > > v4l2-compliance 1.23.0-4942, 32 bits, 32-bit time_t > v4l2-compliance SHA: 4cf258c24026 2022-07-28 15:43:45 > > Compliance test for mtk-mdp3 device /dev/video0: > > Driver Info: > Driver name : mtk-mdp3 > Card type : MediaTek MDP3 > Bus info : platform:14001000.dma-controlle > Driver version : 6.2.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 > > Required ioctls: > test VIDIOC_QUERYCAP: OK > test invalid ioctls: OK > > Allow for multiple opens: > test second /dev/video0 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: 4 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 Requests: OK (Not Supported) > test TIME32/64: OK > > Test input 0: > > Streaming ioctls: > test read/write: OK (Not Supported) > test blocking wait: OK > (snip) > test MMAP (no poll): OK > (snip) > test MMAP (select): OK > (snip) > test MMAP (epoll): OK > test USERPTR (no poll): OK (Not Supported) > test USERPTR (select): OK (Not Supported) > test DMABUF: Cannot test, specify --expbuf-device > > Stream using all formats: > (snip) > Total for mtk-mdp3 device /dev/video0: 1174, Succeeded: 1174, Failed: 0, Warnings: 0 > > Moudy Ho (12): > media: platform: mtk-mdp3: fix potential frame size overflow in > mdp_try_fmt_mplane() > media: platform: mtk-mdp3: add files for chip configuration > media: platform: mtk-mdp3: chip config split about component settings > media: platform: mtk-mdp3: chip config split about subcomponents > media: platform: mtk-mdp3: chip config split about color format > media: platform: mtk-mdp3: chip config split about resolution > limitations > media: platform: mtk-mdp3: chip config split about pipe info > media: platform: mtk-mdp3: extend mdp_color format for compressed mode > media: platform: mtk-mdp3: dynamically allocate component clocks > media: platform: mtk-mdp3: Split general definitions used in MDP3 > media: platform: mtk-mdp3: decompose hardware-related information in > shared memory > media: platform: mtk-mdp3: reconfigure shared memory > > drivers/media/platform/mediatek/mdp3/Makefile | 2 +- > .../platform/mediatek/mdp3/mdp_cfg_data.c | 454 +++++++++++++++ > .../platform/mediatek/mdp3/mdp_sm_mt8183.h | 144 +++++ > .../platform/mediatek/mdp3/mtk-img-ipi.h | 189 +----- > .../platform/mediatek/mdp3/mtk-mdp3-cfg.h | 20 + > .../platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 148 +++-- > .../platform/mediatek/mdp3/mtk-mdp3-comp.c | 538 +++++++++++------- > .../platform/mediatek/mdp3/mtk-mdp3-comp.h | 24 +- > .../platform/mediatek/mdp3/mtk-mdp3-core.c | 46 +- > .../platform/mediatek/mdp3/mtk-mdp3-core.h | 18 +- > .../platform/mediatek/mdp3/mtk-mdp3-m2m.c | 28 +- > .../platform/mediatek/mdp3/mtk-mdp3-m2m.h | 1 - > .../platform/mediatek/mdp3/mtk-mdp3-regs.c | 293 +--------- > .../platform/mediatek/mdp3/mtk-mdp3-regs.h | 214 +++---- > .../platform/mediatek/mdp3/mtk-mdp3-type.h | 53 ++ > .../platform/mediatek/mdp3/mtk-mdp3-vpu.c | 193 +++---- > .../platform/mediatek/mdp3/mtk-mdp3-vpu.h | 29 +- > 17 files changed, 1429 insertions(+), 965 deletions(-) > create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c > create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_sm_mt8183.h > create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cfg.h > create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-type.h >
On Tue, 2023-03-21 at 14:29 +0100, Hans Verkuil wrote: > External email : Please do not click links or open attachments until > you have verified the sender or the content. > > > Hi Moudy, > > On 08/02/2023 10:08, Moudy Ho wrote: > > Changes since v5: > > - Rebase on linux-next. > > - Integrate the chip configuration into a source file called > > "mdp_cfg_data.c" > > instead of a header file. > > - Fix undefined reference to __udividi3 caused by patch [1/12]. > > - Fix parentheses issue reported by check script. > > - Fix compilation and smatch errors > > > > Changes since v4: > > - Rebase on linux-next. > > - Fix potential frame size overflow in "mtk-mdp3-regs.c". > > - Fix OOB in MDP3 component clocks in "mtk-mdp3-comp.*". > > - Reconfigure the shared memory between MDP3 kerenl and SCP. > > > > Changes since v3: > > - Rebase on linux-next. > > - In the file "mtk-mdp3-m2m.c", use the limited resolution defined > > by > > each platform to replace the default format. > > - Add platform ID in driver data, and refine shared memory > > structure preprocessing. > > - Simplify the way to get mutex ID in function > > "mdp_path_subfrm_require". > > > > Changes since v2: > > - Depend on : > > [1] > > https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-mediatek/list/?series=687004__;!!CTRNKA9wMg0ARbw!iAf3tcBZjw9AvEspq5iBDy6AFb5FJqABlIoz-UirBUdXA5xp6vK7hIERvETf2q1Xau_WCznVyqQQjBNhPGkfq2pNtBEmFQ$ > > - Split the shared memory header(mtk-img-ipi.h) by preprocessing > > instead, and > > classify the generic parts into "mtk-mdp3-type.h", and move > > chip-specific parts to"mt8183/mdp3-comp-mt8183.h". > > > > Changes since v1: > > - Depend on : > > [1] > > https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-mediatek/list/?series=687004__;!!CTRNKA9wMg0ARbw!iAf3tcBZjw9AvEspq5iBDy6AFb5FJqABlIoz-UirBUdXA5xp6vK7hIERvETf2q1Xau_WCznVyqQQjBNhPGkfq2pNtBEmFQ$ > > - For hardware-specific structures in the shared memory header(mtk- > > img-ipi.h), > > split the relevant functions and structure definitions. > > > > Hi, > > > > To support multiple chips, a chip configuration header file needs > > to be created > > and the relevant information split and moved into it. > > This series is close to be ready for merging. > > Two issues: please rebase again to the latest media_stage tree > https://urldefense.com/v3/__https://git.linuxtv.org/media_stage.git/__;!!CTRNKA9wMg0ARbw!iAf3tcBZjw9AvEspq5iBDy6AFb5FJqABlIoz-UirBUdXA5xp6vK7hIERvETf2q1Xau_WCznVyqQQjBNhPGkfq2r8-L9Eew$ > > I had a number of conflicts, and I didn't feel comfortable to make > the > changes myself, it wasn't trivial. > > Secondly, I get a smatch error: > > drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c:452 > mdp_cfg_get_id_public() error: 'mdp_dev' dereferencing possible > ERR_PTR() > > In any case, if you can rebase and fix that issue, then I'll make a > PR. > > Thanks! > > Hans > Hi Hans, Thanks for all those assistance, I'll rebase and fix this series as soon as possible. Sincerely, Moudy Ho > > The v4l2-compliance test results list is as follows: > > > > v4l2-compliance 1.23.0-4942, 32 bits, 32-bit time_t > > v4l2-compliance SHA: 4cf258c24026 2022-07-28 15:43:45 > > > > Compliance test for mtk-mdp3 device /dev/video0: > > > > Driver Info: > > Driver name : mtk-mdp3 > > Card type : MediaTek MDP3 > > Bus info : platform:14001000.dma-controlle > > Driver version : 6.2.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 > > > > Required ioctls: > > test VIDIOC_QUERYCAP: OK > > test invalid ioctls: OK > > > > Allow for multiple opens: > > test second /dev/video0 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: 4 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 Requests: OK (Not Supported) > > test TIME32/64: OK > > > > Test input 0: > > > > Streaming ioctls: > > test read/write: OK (Not Supported) > > test blocking wait: OK > > (snip) > > test MMAP (no poll): OK > > (snip) > > test MMAP (select): OK > > (snip) > > test MMAP (epoll): OK > > test USERPTR (no poll): OK (Not Supported) > > test USERPTR (select): OK (Not Supported) > > test DMABUF: Cannot test, specify --expbuf-device > > > > Stream using all formats: > > (snip) > > Total for mtk-mdp3 device /dev/video0: 1174, Succeeded: 1174, > > Failed: 0, Warnings: 0 > > > > Moudy Ho (12): > > media: platform: mtk-mdp3: fix potential frame size overflow in > > mdp_try_fmt_mplane() > > media: platform: mtk-mdp3: add files for chip configuration > > media: platform: mtk-mdp3: chip config split about component > > settings > > media: platform: mtk-mdp3: chip config split about subcomponents > > media: platform: mtk-mdp3: chip config split about color format > > media: platform: mtk-mdp3: chip config split about resolution > > limitations > > media: platform: mtk-mdp3: chip config split about pipe info > > media: platform: mtk-mdp3: extend mdp_color format for compressed > > mode > > media: platform: mtk-mdp3: dynamically allocate component clocks > > media: platform: mtk-mdp3: Split general definitions used in MDP3 > > media: platform: mtk-mdp3: decompose hardware-related information > > in > > shared memory > > media: platform: mtk-mdp3: reconfigure shared memory > > > > drivers/media/platform/mediatek/mdp3/Makefile | 2 +- > > .../platform/mediatek/mdp3/mdp_cfg_data.c | 454 > > +++++++++++++++ > > .../platform/mediatek/mdp3/mdp_sm_mt8183.h | 144 +++++ > > .../platform/mediatek/mdp3/mtk-img-ipi.h | 189 +----- > > .../platform/mediatek/mdp3/mtk-mdp3-cfg.h | 20 + > > .../platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 148 +++-- > > .../platform/mediatek/mdp3/mtk-mdp3-comp.c | 538 +++++++++++--- > > ---- > > .../platform/mediatek/mdp3/mtk-mdp3-comp.h | 24 +- > > .../platform/mediatek/mdp3/mtk-mdp3-core.c | 46 +- > > .../platform/mediatek/mdp3/mtk-mdp3-core.h | 18 +- > > .../platform/mediatek/mdp3/mtk-mdp3-m2m.c | 28 +- > > .../platform/mediatek/mdp3/mtk-mdp3-m2m.h | 1 - > > .../platform/mediatek/mdp3/mtk-mdp3-regs.c | 293 +--------- > > .../platform/mediatek/mdp3/mtk-mdp3-regs.h | 214 +++---- > > .../platform/mediatek/mdp3/mtk-mdp3-type.h | 53 ++ > > .../platform/mediatek/mdp3/mtk-mdp3-vpu.c | 193 +++---- > > .../platform/mediatek/mdp3/mtk-mdp3-vpu.h | 29 +- > > 17 files changed, 1429 insertions(+), 965 deletions(-) > > create mode 100644 > > drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c > > create mode 100644 > > drivers/media/platform/mediatek/mdp3/mdp_sm_mt8183.h > > create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3- > > cfg.h > > create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3- > > type.h > > > >