media: platform: Add support for Digital Image Processing (DIP) on mt8183 SoC
Subsystems (3)
cover media: platform: Add support for Digital Image Processing (DIP) on mt8183 SoC
Hello,
This RFC patch series adding Digital Image Processing (DIP) driver on Mediatek mt8183 SoC. It belongs to the Mediatek's ISP driver series based on V4L2 and media controller framework. I posted the main part of the DIP driver as RFC to discuss first and would like some review comments.
==============
Introduction
==============
Digital Image Processing (DIP) unit can accept the tuning parameters and adjust the image content in Mediatek ISP system. Furthermore, it performs demosaicing and noise reduction on the image to support the advanced camera features of the application. The DIP driver also support image format conversion, resizing and rotation with its hardware path.
The driver is implemented with V4L2 and media controller framework. We have the following entities describing the DIP path. Since a DIP frame has multiple buffers, the driver uses Request API to control the multiple buffer's enqueue flow.
1. Meta (output video device): connects to DIP sub device. It accepts the input tuning buffer from userspace. The metadata interface used currently is only a temporary solution to kick off driver development and is not ready for reviewed yet.
2. RAW (output video device): connects to DIP sub device. It accepts input image buffer from userspace.
3. DIP (sub device): connects to MDP-0 and MDP-1. When processing an image, DIP hardware support multiple output images with different size and format so it needs two capture video devices to return the streaming data to the user.
4. MDP-0 (capture video device): return the processed image data.
5. MDP-1 (capture video device): return the processed image data, the image size and format can be different from the ones of MDP-0.
The overall file structure of the DIP driver is as following:
* mtk_dip-v4l2.c: implements DIP V4L2 and vb2 operations.
* mtk_dip-dev.c: implements dip driver software flow. DIP driver supports 3 software pipes (preview, capture and reprocessing) at the same time. All the pipes share the same DIP hardware to process the images.
* mtk_dip-sys.c: implements the hardware driving part.
* mtk_dip-ctrl.c: handles the HW ctrl requested from userspace.
* mtk_dip-smem.c: provides the shared memory management required operation. We reserve a memory region for the co-processor and DIP to exchange the tuning and hardware configuration data.
==================
Changes in v1
==================
RFC v1 includes the following modification:
1. Uses Request API instead of DIP's buffer collection design
2. removed unnecessary abstraction structurally, including mtk_dip_ctx and related ops
3. removed the dip_smem node from device tree
4. improved the dip_work list's management flow
5. Fixed the common issues Tomasz commented on Mediatek ISP Pass 1's RFC v0 patch series
==================
Dependent patch
==================
DIP driver depends on MDP 3 driver and SCP driver. The patches are as following:
[1]. support mdp3 on mt8183 platform
https://patchwork.kernel.org/cover/10844219/
[2]. Add support for mt8183 SCP
https://patchwork.kernel.org/cover/10872547/
==================
Compliance test
==================
* Test command: v4l2-compliance -m /dev/media0
* test output:
v4l2-compliance SHA: not available, 32 bits
Compliance test for camera-dip device /dev/media0:
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29
Required ioctls:
test MEDIA_IOC_DEVICE_INFO: OK
Allow for multiple opens:
test second /dev/media0 open: OK
test MEDIA_IOC_DEVICE_INFO: OK
test for unlimited opens: OK
Media Controller ioctls:
test MEDIA_IOC_G_TOPOLOGY: OK
Entities: 15 Interfaces: 15 Pads: 24 Links: 27 test MEDIA_IOC_ENUM_ENTITIES/LINKS: OK test MEDIA_IOC_SETUP_LINK: OK
Total for camera-dip device /dev/media0: 7, Succeeded: 7, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for camera-dip device /dev/v4l-subdev0:
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000006 Type : V4L Sub-Device Entity Info: ID : 0x00000001 (1) Name : MTK-ISP-DIP-V4L2 Function : Video Pixel Formatter Pad 0x01000002 : 0: Sink Link 0x0200000c: from remote pad 0x1000009 of entity 'MTK-ISP-DIP-V4L2 Raw Input': Data, Enabled Pad 0x01000003 : 1: Sink Link 0x02000012: from remote pad 0x100000f of entity 'MTK-ISP-DIP-V4L2 Tuning': Data Pad 0x01000004 : 2: Source Link 0x02000018: to remote pad 0x1000015 of entity 'MTK-ISP-DIP-V4L2 MDP0': Data, Enabled, Dynamic Pad 0x01000005 : 3: Source Link 0x0200001e: to remote pad 0x100001b of entity 'MTK-ISP-DIP-V4L2 MDP1': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev0 open: OK
test for unlimited opens: OK
Debug ioctls:
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)
Sub-Device ioctls (Sink Pad 0):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Sink Pad 1):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 2):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 3):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: 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: 2 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported) test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: 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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported) test VIDIOC_EXPBUF: OK (Not Supported)
test Requests: OK (Not Supported)
Total for camera-dip device /dev/v4l-subdev0: 69, Succeeded: 69, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-V4L device /dev/video0:
Driver Info:
Driver name : MTK-ISP-DIP-V4L Card type : MTK-ISP-DIP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84202000
Video Output Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04202000
Video Output Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x0300000a Type : V4L Video Entity Info: ID : 0x00000008 (8) Name : MTK-ISP-DIP-V4L2 Raw Input Function : V4L2 I/O Pad 0x01000009 : 0: Source Link 0x0200000c: to remote pad 0x1000002 of entity 'MTK-ISP-DIP-V4L2': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-V4L device /dev/video0: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-V4L device /dev/video1:
Driver Info:
Driver name : MTK-ISP-DIP-V4L Card type : MTK-ISP-DIP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x8c200000
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x0c200000
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000010 Type : V4L Video Entity Info: ID : 0x0000000e (14) Name : MTK-ISP-DIP-V4L2 Tuning Function : V4L2 I/O Pad 0x0100000f : 0: Source Link 0x02000012: to remote pad 0x1000003 of entity 'MTK-ISP-DIP-V4L2': Data
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video1 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 (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 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 (Not Supported)
test Composing: OK (Not Supported)
test Scaling: 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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK
Total for MTK-ISP-DIP-V4L device /dev/video1: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-V4L device /dev/video2:
Driver Info:
Driver name : MTK-ISP-DIP-V4L Card type : MTK-ISP-DIP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000016 Type : V4L Video Entity Info: ID : 0x00000014 (20) Name : MTK-ISP-DIP-V4L2 MDP0 Function : V4L2 I/O Pad 0x01000015 : 0: Sink Link 0x02000018: from remote pad 0x1000004 of entity 'MTK-ISP-DIP-V4L2': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video2 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-V4L device /dev/video2: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-V4L device /dev/video3:
Driver Info:
Driver name : MTK-ISP-DIP-V4L Card type : MTK-ISP-DIP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x0300001c Type : V4L Video Entity Info: ID : 0x0000001a (26) Name : MTK-ISP-DIP-V4L2 MDP1 Function : V4L2 I/O Pad 0x0100001b : 0: Sink Link 0x0200001e: from remote pad 0x1000005 of entity 'MTK-ISP-DIP-V4L2': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video3 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-V4L device /dev/video3: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for camera-dip device /dev/v4l-subdev1:
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000025 Type : V4L Sub-Device Entity Info: ID : 0x00000020 (32) Name : MTK-ISP-DIP-CAP-V4L2 Function : Video Pixel Formatter Pad 0x01000021 : 0: Sink Link 0x0200002b: from remote pad 0x1000028 of entity 'MTK-ISP-DIP-CAP-V4L2 Raw Input': Data, Enabled Pad 0x01000022 : 1: Sink Link 0x02000031: from remote pad 0x100002e of entity 'MTK-ISP-DIP-CAP-V4L2 Tuning': Data Pad 0x01000023 : 2: Source Link 0x02000037: to remote pad 0x1000034 of entity 'MTK-ISP-DIP-CAP-V4L2 MDP0': Data, Enabled, Dynamic Pad 0x01000024 : 3: Source Link 0x0200003d: to remote pad 0x100003a of entity 'MTK-ISP-DIP-CAP-V4L2 MDP1': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev1 open: OK
test for unlimited opens: OK
Debug ioctls:
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)
Sub-Device ioctls (Sink Pad 0):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Sink Pad 1):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 2):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 3):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: 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: 2 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported) test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: 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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported) test VIDIOC_EXPBUF: OK (Not Supported)
test Requests: OK (Not Supported)
Total for camera-dip device /dev/v4l-subdev1: 69, Succeeded: 69, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-CAP device /dev/video4:
Driver Info:
Driver name : MTK-ISP-DIP-CAP Card type : MTK-ISP-DIP-CAP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84202000
Video Output Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04202000
Video Output Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000029 Type : V4L Video Entity Info: ID : 0x00000027 (39) Name : MTK-ISP-DIP-CAP-V4L2 Raw Input Function : V4L2 I/O Pad 0x01000028 : 0: Source Link 0x0200002b: to remote pad 0x1000021 of entity 'MTK-ISP-DIP-CAP-V4L2': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video4 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-CAP device /dev/video4: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-CAP device /dev/video5:
Driver Info:
Driver name : MTK-ISP-DIP-CAP Card type : MTK-ISP-DIP-CAP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x8c200000
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x0c200000
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x0300002f Type : V4L Video Entity Info: ID : 0x0000002d (45) Name : MTK-ISP-DIP-CAP-V4L2 Tuning Function : V4L2 I/O Pad 0x0100002e : 0: Source Link 0x02000031: to remote pad 0x1000022 of entity 'MTK-ISP-DIP-CAP-V4L2': Data
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video5 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 (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 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 (Not Supported)
test Composing: OK (Not Supported)
test Scaling: 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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK
Total for MTK-ISP-DIP-CAP device /dev/video5: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-CAP device /dev/video6:
Driver Info:
Driver name : MTK-ISP-DIP-CAP Card type : MTK-ISP-DIP-CAP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000035 Type : V4L Video Entity Info: ID : 0x00000033 (51) Name : MTK-ISP-DIP-CAP-V4L2 MDP0 Function : V4L2 I/O Pad 0x01000034 : 0: Sink Link 0x02000037: from remote pad 0x1000023 of entity 'MTK-ISP-DIP-CAP-V4L2': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video6 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-CAP device /dev/video6: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-CAP device /dev/video7:
Driver Info:
Driver name : MTK-ISP-DIP-CAP Card type : MTK-ISP-DIP-CAP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x0300003b Type : V4L Video Entity Info: ID : 0x00000039 (57) Name : MTK-ISP-DIP-CAP-V4L2 MDP1 Function : V4L2 I/O Pad 0x0100003a : 0: Sink Link 0x0200003d: from remote pad 0x1000024 of entity 'MTK-ISP-DIP-CAP-V4L2': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video7 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-CAP device /dev/video7: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for camera-dip device /dev/v4l-subdev2:
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000044 Type : V4L Sub-Device Entity Info: ID : 0x0000003f (63) Name : MTK-ISP-DIP-REP-V4L2 Function : Video Pixel Formatter Pad 0x01000040 : 0: Sink Link 0x0200004a: from remote pad 0x1000047 of entity 'MTK-ISP-DIP-REP-V4L2 Raw Input': Data, Enabled Pad 0x01000041 : 1: Sink Link 0x02000050: from remote pad 0x100004d of entity 'MTK-ISP-DIP-REP-V4L2 Tuning': Data Pad 0x01000042 : 2: Source Link 0x02000056: to remote pad 0x1000053 of entity 'MTK-ISP-DIP-REP-V4L2 MDP0': Data, Enabled, Dynamic Pad 0x01000043 : 3: Source Link 0x0200005c: to remote pad 0x1000059 of entity 'MTK-ISP-DIP-REP-V4L2 MDP1': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev2 open: OK
test for unlimited opens: OK
Debug ioctls:
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)
Sub-Device ioctls (Sink Pad 0):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Sink Pad 1):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 2):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 3):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Try VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported) test Active VIDIOC_SUBDEV_G/S_FMT: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: 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: 2 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported) test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: 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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported) test VIDIOC_EXPBUF: OK (Not Supported)
test Requests: OK (Not Supported)
Total for camera-dip device /dev/v4l-subdev2: 69, Succeeded: 69, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-REP device /dev/video8:
Driver Info:
Driver name : MTK-ISP-DIP-REP Card type : MTK-ISP-DIP-REP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84202000
Video Output Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04202000
Video Output Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000048 Type : V4L Video Entity Info: ID : 0x00000046 (70) Name : MTK-ISP-DIP-REP-V4L2 Raw Input Function : V4L2 I/O Pad 0x01000047 : 0: Source Link 0x0200004a: to remote pad 0x1000040 of entity 'MTK-ISP-DIP-REP-V4L2': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video8 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-REP device /dev/video8: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-REP device /dev/video9:
Driver Info:
Driver name : MTK-ISP-DIP-REP Card type : MTK-ISP-DIP-REP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x8c200000
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x0c200000
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x0300004e Type : V4L Video Entity Info: ID : 0x0000004c (76) Name : MTK-ISP-DIP-REP-V4L2 Tuning Function : V4L2 I/O Pad 0x0100004d : 0: Source Link 0x02000050: to remote pad 0x1000041 of entity 'MTK-ISP-DIP-REP-V4L2': Data
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video9 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 (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 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 (Not Supported)
test Composing: OK (Not Supported)
test Scaling: 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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK
Total for MTK-ISP-DIP-REP device /dev/video9: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-REP device /dev/video10:
Driver Info:
Driver name : MTK-ISP-DIP-REP Card type : MTK-ISP-DIP-REP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x03000054 Type : V4L Video Entity Info: ID : 0x00000052 (82) Name : MTK-ISP-DIP-REP-V4L2 MDP0 Function : V4L2 I/O Pad 0x01000053 : 0: Sink Link 0x02000056: from remote pad 0x1000042 of entity 'MTK-ISP-DIP-REP-V4L2': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video10 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-REP device /dev/video10: 45, Succeeded: 45, Failed: 0, Warnings: 0
--------------------------------------------------------------------------------
Compliance test for MTK-ISP-DIP-REP device /dev/video11:
Driver Info:
Driver name : MTK-ISP-DIP-REP Card type : MTK-ISP-DIP-REP-V4L2 Bus info : platform:15022000.dip Driver version : 4.19.29 Capabilities : 0x84201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04201000
Video Capture Multiplanar
Streaming
Extended Pix Format
Media Driver Info:
Driver name : camera-dip Model : MTK-ISP-DIP-V4L2 Serial : Bus info : platform:15022000.dip Media version : 4.19.29 Hardware revision: 0x00000000 (0) Driver version : 4.19.29 Interface Info: ID : 0x0300005a Type : V4L Video Entity Info: ID : 0x00000058 (88) Name : MTK-ISP-DIP-REP-V4L2 MDP1 Function : V4L2 I/O Pad 0x01000059 : 0: Sink Link 0x0200005c: from remote pad 0x1000043 of entity 'MTK-ISP-DIP-REP-V4L2': Data, Enabled, Dynamic
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video11 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: 1 Private Controls: 1
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 (Not Supported)
test Composing: OK (Not Supported)
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
Total for MTK-ISP-DIP-REP device /dev/video11: 45, Succeeded: 45, Failed: 0, Warnings: 0
Grand Total for camera-dip device /dev/media0: 754, Succeeded: 754, Failed: 0, Warnings: 0
Frederic Chen (6):
dt-bindings: mt8183: Add binding for DIP shared memory
dts: arm64: mt8183: Add DIP shared memory node
dt-bindings: mt8183: Added DIP dt-bindings
dts: arm64: mt8183: Add DIP nodes
media: platform: Add Mediatek DIP driver KConfig
platform: mtk-isp: Add Mediatek DIP driver
.../bindings/media/mediatek,mt8183-dip.txt | 35 + .../mediatek,reserve-memory-dip_smem.txt | 45 + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 29 + drivers/media/platform/Kconfig | 2 + drivers/media/platform/mtk-isp/Kconfig | 21 + drivers/media/platform/mtk-isp/Makefile | 18 + .../media/platform/mtk-isp/isp_50/Makefile | 17 + .../platform/mtk-isp/isp_50/dip/Makefile | 32 + .../mtk-isp/isp_50/dip/mtk_dip-ctrl.c | 124 ++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.c | 1116 +++++++++++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.h | 321 ++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-hw.h | 167 ++ .../mtk-isp/isp_50/dip/mtk_dip-smem.c | 322 ++++ .../mtk-isp/isp_50/dip/mtk_dip-smem.h | 39 + .../platform/mtk-isp/isp_50/dip/mtk_dip-sys.c | 1384 +++++++++++++++++ .../mtk-isp/isp_50/dip/mtk_dip-v4l2.c | 1310 ++++++++++++++++ 16 files changed, 4982 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt create mode 100644 drivers/media/platform/mtk-isp/Kconfig create mode 100644 drivers/media/platform/mtk-isp/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Signature · 1 line
2.18.0
RFC PATCH 1/6 dt-bindings: mt8183: Add binding for DIP shared memory
This patch adds the binding for describing the shared memory used to exchange configuration and tuning data between the co-processor and Digital Image Processing (DIP) unit of the camera ISP system on Mediatek SoCs.
--- .../mediatek,reserve-memory-dip_smem.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +45 -0
@@ -0,0 +1,45 @@ +Mediatek DIP Shared Memory binding + +This binding describes the shared memory, which serves the purpose of +describing the shared memory region used to exchange data between Digital +Image Processing (DIP) and co-processor in Mediatek SoCs. + +The co-processor doesn't have the iommu so we need to use the physical +address to access the shared buffer in the firmware. + +The Digital Image Processing (DIP) can access memory through mt8183 IOMMU so +it can use dma address to access the memory region. +(See iommu/mediatek,iommu.txt for the detailed description of Mediatek IOMMU) + + +Required properties: + +- compatible: must be "mediatek,reserve-memory-dip_smem" + +- reg: required for static allocation (see reserved-memory.txt for + the detailed usage) + +- alloc-range: required for dynamic allocation. The range must + between 0x00000400 and 0x100000000 due to the co-processer's + addressing limitation + +- size: required for dynamic allocation. The unit is bytes. + If you want to enable the full feature of Digital Processing Unit, + you need 20 MB at least. + + +Example: + +The following example shows the DIP shared memory setup for MT8183. + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + reserve-memory-dip_smem { + compatible = "mediatek,reserve-memory-dip_smem"; + size = <0 0x1400000>; + alignment = <0 0x1000>; + alloc-ranges = <0 0x40000000 0 0x50000000>; + }; + };
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [RFC PATCH V1 1/6] dt-bindings: mt8183: Add binding for DIP shared memory
Quoted 24 lines · Frederic Chen
This patch adds the binding for describing the shared memory used to exchange configuration and tuning data between the co-processor and Digital Image Processing (DIP) unit of the camera ISP system on Mediatek SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../mediatek,reserve-memory-dip_smem.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txtDocumentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +7
-0@@ -0,0 +1,45 @@ +Mediatek DIP Shared Memory binding + +This binding describes the shared memory, which serves the purpose of +describing the shared memory region used to exchange data between Digital +Image Processing (DIP) and co-processor in Mediatek SoCs. + +The co-processor doesn't have the iommu so we need to use the physical
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 17
Quoted 10 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +10
-0+address to access the shared buffer in the firmware. + +The Digital Image Processing (DIP) can access memory through mt8183 IOMMU so +it can use dma address to access the memory region. +(See iommu/mediatek,iommu.txt for the detailed description of Mediatek IOMMU) + + +Required properties: + +- compatible: must be "mediatek,reserve-memory-dip_smem"
Don't use '_'.
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 24
Quoted 7 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +7
-0+ +- reg: required for static allocation (see reserved-memory.txt for + the detailed usage) + +- alloc-range: required for dynamic allocation. The range must + between 0x00000400 and 0x100000000 due to the co-processer's + addressing limitation
Generally, you should pick either static or dynamic allocation for a given binding. Static if there's some address restriction or sharing, dynamic if not.
Sounds like static in this case.
Quoted 24 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +21
-0+ +- size: required for dynamic allocation. The unit is bytes. + If you want to enable the full feature of Digital Processing Unit, + you need 20 MB at least. + + +Example: + +The following example shows the DIP shared memory setup for MT8183. + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + reserve-memory-dip_smem { + compatible = "mediatek,reserve-memory-dip_smem"; + size = <0 0x1400000>; + alignment = <0 0x1000>; + alloc-ranges = <0 0x40000000 0 0x50000000>; + }; + };Signature · 1 line
2.18.0
Re: [RFC PATCH V1 1/6] dt-bindings: mt8183: Add binding for DIP shared memory
Dear Rob,
I appreciate your comments.
Quoted 29 lines · Rob Herring
Quoted 28 lines · Frederic Chen
This patch adds the binding for describing the shared memory used to exchange configuration and tuning data between the co-processor and Digital Image Processing (DIP) unit of the camera ISP system on Mediatek SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../mediatek,reserve-memory-dip_smem.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txtDocumentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +11
-0@@ -0,0 +1,45 @@ +Mediatek DIP Shared Memory binding + +This binding describes the shared memory, which serves the purpose of +describing the shared memory region used to exchange data between Digital +Image Processing (DIP) and co-processor in Mediatek SoCs. + +The co-processor doesn't have the iommu so we need to use the physical +address to access the shared buffer in the firmware. + +The Digital Image Processing (DIP) can access memory through mt8183 IOMMU so +it can use dma address to access the memory region.
Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 17
Quoted 6 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +6
-0+(See iommu/mediatek,iommu.txt for the detailed description of Mediatek IOMMU) + + +Required properties: + +- compatible: must be "mediatek,reserve-memory-dip_smem"Don't use '_'.
I got it. I will use "mediatek,reserve-memory-dip-smem" instead in next version of the patch
Quoted 13 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 24
Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +7
-0+ +- reg: required for static allocation (see reserved-memory.txt for + the detailed usage) + +- alloc-range: required for dynamic allocation. The range must + between 0x00000400 and 0x100000000 due to the co-processer's + addressing limitationGenerally, you should pick either static or dynamic allocation for a given binding. Static if there's some address restriction or sharing, dynamic if not.
Quoted 2 lines
Sounds like static in this case.
DIP reserved memory has address restriction so it is the static case. I would like to remove the dynamic allocation part and modify the description as following:
- reg: required for DIP. The range must be between 0x00000400 and 0x100000000 due to the co-processor's addressing limitation. The size must be 26MB. Please see reserved-memory.txt for the detailed usage.
Quoted 16 lines
Quoted 16 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +16
-0+ +- size: required for dynamic allocation. The unit is bytes. + If you want to enable the full feature of Digital Processing Unit, + you need 20 MB at least. + + +Example: + +The following example shows the DIP shared memory setup for MT8183. + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + reserve-memory-dip_smem { + compatible = "mediatek,reserve-memory-dip_smem";
Quoted 8 lines
Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +5
-0+ size = <0 0x1400000>; + alignment = <0 0x1000>; + alloc-ranges = <0 0x40000000 0 0x50000000>; + }; + };Signature · 1 line
2.18.0
Sincerely,
Frederic Chen
Rob Herring
maintainerRe: [RFC PATCH V1 1/6] dt-bindings: mt8183: Add binding for DIP shared memory
Quoted 63 lines · Frederic Chen
Dear Rob,
I appreciate your comments.
Quoted 29 lines · Rob Herring
Quoted 28 lines · Frederic Chen
This patch adds the binding for describing the shared memory used to exchange configuration and tuning data between the co-processor and Digital Image Processing (DIP) unit of the camera ISP system on Mediatek SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../mediatek,reserve-memory-dip_smem.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txtDocumentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +11
-0@@ -0,0 +1,45 @@ +Mediatek DIP Shared Memory binding + +This binding describes the shared memory, which serves the purpose of +describing the shared memory region used to exchange data between Digital +Image Processing (DIP) and co-processor in Mediatek SoCs. + +The co-processor doesn't have the iommu so we need to use the physical +address to access the shared buffer in the firmware. + +The Digital Image Processing (DIP) can access memory through mt8183 IOMMU so +it can use dma address to access the memory region.Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 17
Quoted 6 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +6
-0+(See iommu/mediatek,iommu.txt for the detailed description of Mediatek IOMMU) + + +Required properties: + +- compatible: must be "mediatek,reserve-memory-dip_smem"Don't use '_'.
I got it. I will use "mediatek,reserve-memory-dip-smem" instead in next version of the patch
Quoted 13 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 24
Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +7
-0+ +- reg: required for static allocation (see reserved-memory.txt for + the detailed usage) + +- alloc-range: required for dynamic allocation. The range must + between 0x00000400 and 0x100000000 due to the co-processer's + addressing limitationGenerally, you should pick either static or dynamic allocation for a given binding. Static if there's some address restriction or sharing, dynamic if not.
Quoted 2 lines
Sounds like static in this case.
Quoted 8 lines
DIP reserved memory has address restriction so it is the static case. I would like to remove the dynamic allocation part and modify the description as following:
- reg: required for DIP. The range must be between
0x00000400and0x100000000due to the co-processor's addressing limitation. The size must be 26MB. Please see reserved-memory.txt for the detailed usage.
You can use dma-ranges to define addressing translations and restrictions like this. That will in turn set the device's dma-mask to ensure allocations are done in a region that is addressable.
But if you have a known, fixed size, then a carve out with reserved-memory is fine.
Rob
Re: [RFC PATCH V1 1/6] dt-bindings: mt8183: Add binding for DIP shared memory
Quoted 74 lines · Rob Herring
Quoted 63 lines · Frederic Chen
Dear Rob,
I appreciate your comments.
Quoted 29 lines · Rob Herring
Quoted 28 lines · Frederic Chen
This patch adds the binding for describing the shared memory used to exchange configuration and tuning data between the co-processor and Digital Image Processing (DIP) unit of the camera ISP system on Mediatek SoCs.
--- .../mediatek,reserve-memory-dip_smem.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txtDocumentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +11
-0@@ -0,0 +1,45 @@ +Mediatek DIP Shared Memory binding + +This binding describes the shared memory, which serves the purpose of +describing the shared memory region used to exchange data between Digital +Image Processing (DIP) and co-processor in Mediatek SoCs. + +The co-processor doesn't have the iommu so we need to use the physical +address to access the shared buffer in the firmware. + +The Digital Image Processing (DIP) can access memory through mt8183 IOMMU so +it can use dma address to access the memory region.Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 17
Quoted 6 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +6
-0+(See iommu/mediatek,iommu.txt for the detailed description of Mediatek IOMMU) + + +Required properties: + +- compatible: must be "mediatek,reserve-memory-dip_smem"Don't use '_'.
I got it. I will use "mediatek,reserve-memory-dip-smem" instead in next version of the patch
Quoted 13 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 24
Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +7
-0+ +- reg: required for static allocation (see reserved-memory.txt for + the detailed usage) + +- alloc-range: required for dynamic allocation. The range must + between 0x00000400 and 0x100000000 due to the co-processer's + addressing limitationGenerally, you should pick either static or dynamic allocation for a given binding. Static if there's some address restriction or sharing, dynamic if not.
Quoted 2 lines
Sounds like static in this case.
Quoted 8 lines
DIP reserved memory has address restriction so it is the static case. I would like to remove the dynamic allocation part and modify the description as following:
- reg: required for DIP. The range must be between
0x00000400and0x100000000due to the co-processor's addressing limitation. The size must be 26MB. Please see reserved-memory.txt for the detailed usage.
Quoted 6 lines
You can use dma-ranges to define addressing translations and restrictions like this. That will in turn set the device's dma-mask to ensure allocations are done in a region that is addressable.
But if you have a known, fixed size, then a carve out with reserved-memory is fine.
There is also another aspect here. The coprocessor that we're allocating the memory for is behind an MPU that must be programmed completely in one go and locked for security reasons to ensure that the coprocessor itself doesn't rewrite the MPU settings. That means that we need to have all the allocations completed before booting that coprocessor.
To be honest, I'd adopt a completely different design here.
We're going to have a driver for that coprocessor (SCP) and IMHO any shared memory areas should belong to it. Then, any specific drivers talking to the firmware running on SCP should ask the SCP driver to allocate some memory from its fixed pool. WDYT?
Best regards,
Tomasz
Rob Herring
maintainerRe: [RFC PATCH V1 1/6] dt-bindings: mt8183: Add binding for DIP shared memory
Quoted 90 lines · Tomasz Figa
Quoted 74 lines · Rob Herring
Quoted 63 lines · Frederic Chen
Dear Rob,
I appreciate your comments.
Quoted 29 lines · Rob Herring
Quoted 28 lines · Frederic Chen
This patch adds the binding for describing the shared memory used to exchange configuration and tuning data between the co-processor and Digital Image Processing (DIP) unit of the camera ISP system on Mediatek SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../mediatek,reserve-memory-dip_smem.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txtDocumentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +11
-0@@ -0,0 +1,45 @@ +Mediatek DIP Shared Memory binding + +This binding describes the shared memory, which serves the purpose of +describing the shared memory region used to exchange data between Digital +Image Processing (DIP) and co-processor in Mediatek SoCs. + +The co-processor doesn't have the iommu so we need to use the physical +address to access the shared buffer in the firmware. + +The Digital Image Processing (DIP) can access memory through mt8183 IOMMU so +it can use dma address to access the memory region.Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 17
Quoted 6 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +6
-0+(See iommu/mediatek,iommu.txt for the detailed description of Mediatek IOMMU) + + +Required properties: + +- compatible: must be "mediatek,reserve-memory-dip_smem"Don't use '_'.
I got it. I will use "mediatek,reserve-memory-dip-smem" instead in next version of the patch
Quoted 13 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt line 24
Quoted 8 lines
Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-dip_smem.txt new file +7
-0+ +- reg: required for static allocation (see reserved-memory.txt for + the detailed usage) + +- alloc-range: required for dynamic allocation. The range must + between 0x00000400 and 0x100000000 due to the co-processer's + addressing limitationGenerally, you should pick either static or dynamic allocation for a given binding. Static if there's some address restriction or sharing, dynamic if not.
Quoted 2 lines
Sounds like static in this case.
Quoted 8 lines
DIP reserved memory has address restriction so it is the static case. I would like to remove the dynamic allocation part and modify the description as following:
- reg: required for DIP. The range must be between
0x00000400and0x100000000due to the co-processor's addressing limitation. The size must be 26MB. Please see reserved-memory.txt for the detailed usage.Quoted 6 lines
You can use dma-ranges to define addressing translations and restrictions like this. That will in turn set the device's dma-mask to ensure allocations are done in a region that is addressable.
But if you have a known, fixed size, then a carve out with reserved-memory is fine.
There is also another aspect here. The coprocessor that we're allocating the memory for is behind an MPU that must be programmed completely in one go and locked for security reasons to ensure that the coprocessor itself doesn't rewrite the MPU settings. That means that we need to have all the allocations completed before booting that coprocessor.
Quoted 6 lines
To be honest, I'd adopt a completely different design here.
We're going to have a driver for that coprocessor (SCP) and IMHO any shared memory areas should belong to it. Then, any specific drivers talking to the firmware running on SCP should ask the SCP driver to allocate some memory from its fixed pool. WDYT?
That's more than just an address restriction, so yeah, use a reserved-memory area.
Rob
RFC PATCH 2/6 dts: arm64: mt8183: Add DIP shared memory node
In reply to Frederic ChenThis patch adds a shared memory region used on mt8183 for exchanging tuning data between co-processor and Digital Image Processing(DIP) unit.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +13 -0
@@ -134,6 +134,19 @@ clock-output-names = "clk26m"; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + reserve-memory-dip_smem { + compatible = "mediatek,reserve-memory-dip_smem"; + no-map; + size = <0 0x01400000>; /*20 MB share mem size */ + alignment = <0 0x1000>; + alloc-ranges = <0 0x40000000 0 0x10000000>; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupt-parent = <&gic>;
Signature · 1 line
2.18.0
RFC PATCH 3/6 dt-bindings: mt8183: Added DIP dt-bindings
In reply to Frederic ChenThis patch adds DT binding documentation for the Digital Image Processing (DIP) unit of camera ISP system on Mediatek's SoCs.
--- .../bindings/media/mediatek,mt8183-dip.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +35 -0
@@ -0,0 +1,35 @@ +* Mediatek Digital Image Processor (DIP) + +Digital Image Processor (DIP) unit in Mediatek ISP system is responsible for +image content adjustment according to the tuning parameters. DIP can process +the image form memory buffer and output the processed image to multiple output +buffers. Furthermore, it can support demosaicing and noise reduction on the +images. + +Required properties: +- compatible: "mediatek,mt8183-dip" +- reg: Physical base address and length of the function block register space +- interrupts: interrupt number to the cpu +- iommus: should point to the respective IOMMU block with master port as + argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + for details. +- mediatek,larb: must contain the local arbiters in the current Socs, see + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + for details. +- clocks: must contain the local arbiters 5 (LARB5) and DIP clock +- clock-names: must contain DIP_CG_IMG_LARB5 and DIP_CG_IMG_DIP + +Example: + dip: dip@15022000 { + compatible = "mediatek,mt8183-dip"; + mediatek,larb = <&larb5>; + mediatek,mdp3 = <&mdp_rdma0>; + mediatek,vpu = <&vpu>; + iommus = <&iommu M4U_PORT_CAM_IMGI>; + reg = <0 0x15022000 0 0x6000>; + interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_LOW>; + clocks = <&imgsys CLK_IMG_LARB5>, + <&imgsys CLK_IMG_DIP>; + clock-names = "DIP_CG_IMG_LARB5", + "DIP_CG_IMG_DIP"; + };
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [RFC PATCH V1 3/6] dt-bindings: mt8183: Added DIP dt-bindings
Quoted 33 lines · Frederic Chen
This patch adds DT binding documentation for the Digital Image Processing (DIP) unit of camera ISP system on Mediatek's SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../bindings/media/mediatek,mt8183-dip.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txtDocumentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +18
-0@@ -0,0 +1,35 @@ +* Mediatek Digital Image Processor (DIP) + +Digital Image Processor (DIP) unit in Mediatek ISP system is responsible for +image content adjustment according to the tuning parameters. DIP can process +the image form memory buffer and output the processed image to multiple output +buffers. Furthermore, it can support demosaicing and noise reduction on the +images. + +Required properties: +- compatible: "mediatek,mt8183-dip" +- reg: Physical base address and length of the function block register space +- interrupts: interrupt number to the cpu +- iommus: should point to the respective IOMMU block with master port as + argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + for details. +- mediatek,larb: must contain the local arbiters in the current Socs, see + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + for details.
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt line 27
Quoted 10 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +9
-0+- clocks: must contain the local arbiters 5 (LARB5) and DIP clock +- clock-names: must contain DIP_CG_IMG_LARB5 and DIP_CG_IMG_DIP + +Example: + dip: dip@15022000 { + compatible = "mediatek,mt8183-dip"; + mediatek,larb = <&larb5>; + mediatek,mdp3 = <&mdp_rdma0>; + mediatek,vpu = <&vpu>;
Not documented.
Quoted 11 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +8
-0+ iommus = <&iommu M4U_PORT_CAM_IMGI>; + reg = <0 0x15022000 0 0x6000>; + interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_LOW>; + clocks = <&imgsys CLK_IMG_LARB5>, + <&imgsys CLK_IMG_DIP>; + clock-names = "DIP_CG_IMG_LARB5", + "DIP_CG_IMG_DIP"; + };Signature · 1 line
2.18.0
Re: [RFC PATCH V1 3/6] dt-bindings: mt8183: Added DIP dt-bindings
Dear Rob,
I appreciate your comments.
Quoted 42 lines · Rob Herring
Quoted 40 lines · Frederic Chen
This patch adds DT binding documentation for the Digital Image Processing (DIP) unit of camera ISP system on Mediatek's SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../bindings/media/mediatek,mt8183-dip.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txtDocumentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +25
-0@@ -0,0 +1,35 @@ +* Mediatek Digital Image Processor (DIP) + +Digital Image Processor (DIP) unit in Mediatek ISP system is responsible for +image content adjustment according to the tuning parameters. DIP can process +the image form memory buffer and output the processed image to multiple output +buffers. Furthermore, it can support demosaicing and noise reduction on the +images. + +Required properties: +- compatible: "mediatek,mt8183-dip" +- reg: Physical base address and length of the function block register space +- interrupts: interrupt number to the cpu +- iommus: should point to the respective IOMMU block with master port as + argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + for details. +- mediatek,larb: must contain the local arbiters in the current Socs, see + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + for details. +- clocks: must contain the local arbiters 5 (LARB5) and DIP clock +- clock-names: must contain DIP_CG_IMG_LARB5 and DIP_CG_IMG_DIP + +Example: + dip: dip@15022000 { + compatible = "mediatek,mt8183-dip"; + mediatek,larb = <&larb5>;
Quoted 5 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt line 27
Quoted 2 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +2
-0+ mediatek,mdp3 = <&mdp_rdma0>; + mediatek,vpu = <&vpu>;Not documented.
“mediatek,vpu” will be replaced by “mediatek,scp.” I would like to add the following description in next version of the patch:
- mediatek,scp: must point to the scp block of the co-processor used with DIP. Please see Documentation/devicetree/bindings/remoteproc/mtk,scp.txt for the detail.
- mediatek,mdp3: must point to the Media Data Path 3 (MDP3) block. Please see Documentation/devicetree/bindings/media/mediatek,mt8183-mdp3.txt for the detail.
Example:
mdp_rdma0: mdp_rdma0@14001000 {
compatible = "mediatek,mt8183-mdp-rdma",
"mediatek,mt8183-mdp3";
mediatek,vpu = <&vpu>;
mediatek,scp = <&scp>;
mediatek,mdp-id = <0>;
/* ...... */
};
scp: scp@10500000 {
compatible = "mediatek,mt8183-scp";
reg = <0 0x10500000 0 0x80000>,
<0 0x105c0000 0 0x5000>;
reg-names = "sram", "cfg";
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&infracfg CLK_INFRA_SCPSYS>;
clock-names = "main";
memory-region = <&scp_mem_reserved>;
status = "okay";
};
dip: dip@15022000 {
compatible = "mediatek,mt8183-dip";
mediatek,larb = <&larb5>;
mediatek,mdp3 = <&mdp_rdma0>;
mediatek,scp = <&scp>;
/* ...... */
};The dependent Mediatek SCP and MDP3 patch have been sent:
[1] Mediatek SCP, https://patchwork.kernel.org/patch/10897319/
[2] Meidatek MDP3, https://patchwork.kernel.org/patch/10844229/
Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +8
-0+ iommus = <&iommu M4U_PORT_CAM_IMGI>; + reg = <0 0x15022000 0 0x6000>; + interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_LOW>; + clocks = <&imgsys CLK_IMG_LARB5>, + <&imgsys CLK_IMG_DIP>; + clock-names = "DIP_CG_IMG_LARB5", + "DIP_CG_IMG_DIP"; + };Signature · 1 line
2.18.0
Sincerely,
Frederic Chen
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rob Herring
maintainerRe: [RFC PATCH V1 3/6] dt-bindings: mt8183: Added DIP dt-bindings
Quoted 62 lines · Frederic Chen
Dear Rob,
I appreciate your comments.
Quoted 42 lines · Rob Herring
Quoted 40 lines · Frederic Chen
This patch adds DT binding documentation for the Digital Image Processing (DIP) unit of camera ISP system on Mediatek's SoCs.
Signed-off-by Frederic Chen <[email protected]>--- .../bindings/media/mediatek,mt8183-dip.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txtDocumentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +25
-0@@ -0,0 +1,35 @@ +* Mediatek Digital Image Processor (DIP) + +Digital Image Processor (DIP) unit in Mediatek ISP system is responsible for +image content adjustment according to the tuning parameters. DIP can process +the image form memory buffer and output the processed image to multiple output +buffers. Furthermore, it can support demosaicing and noise reduction on the +images. + +Required properties: +- compatible: "mediatek,mt8183-dip" +- reg: Physical base address and length of the function block register space +- interrupts: interrupt number to the cpu +- iommus: should point to the respective IOMMU block with master port as + argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + for details. +- mediatek,larb: must contain the local arbiters in the current Socs, see + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + for details. +- clocks: must contain the local arbiters 5 (LARB5) and DIP clock +- clock-names: must contain DIP_CG_IMG_LARB5 and DIP_CG_IMG_DIP + +Example: + dip: dip@15022000 { + compatible = "mediatek,mt8183-dip"; + mediatek,larb = <&larb5>;Quoted 5 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt line 27
Quoted 2 lines
Documentation/devicetree/bindings/media/mediatek,mt8183-dip.txt new file +2
-0+ mediatek,mdp3 = <&mdp_rdma0>; + mediatek,vpu = <&vpu>;Not documented.
“mediatek,vpu” will be replaced by “mediatek,scp.” I would like to add the following description in next version of the patch:
- mediatek,scp: must point to the scp block of the co-processor used with DIP. Please see
Documentation/devicetree/bindings/remoteproc/mtk,scp.txtfor the detail.
Quoted 4 lines
- mediatek,mdp3: must point to the Media Data Path 3 (MDP3) block. Please see
Documentation/devicetree/bindings/media/mediatek,mt8183-mdp3.txtfor the detail.
If there's only 1 of each of these blocks, there's no need to have phandle. Just find the matching node using the compatible string(s).
Rob
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RFC PATCH 4/6 dts: arm64: mt8183: Add DIP nodes
In reply to Frederic ChenThis patch adds nodes for Digital Image Processing (DIP). DIP is embedded in Mediatek SoCs and works with the co-processor to adjust image content according to tuning input data. It also provides image format conversion, resizing, and rotation features.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +16 -0
@@ -445,6 +445,22 @@ #clock-cells = <1>; }; + dip: dip@15022000 { + compatible = "mediatek,mt8183-dip"; + mediatek,larb = <&larb5>; + mediatek,mdp3 = <&mdp_rdma0>; + mediatek,vpu = <&vpu>; + iommus = <&iommu M4U_PORT_CAM_IMGI>; + reg = <0 0x15022000 0 0x6000>; + interrupts = <GIC_SPI 268 IRQ_TYPE_LEVEL_LOW>; + clocks = + <&imgsys CLK_IMG_LARB5>, + <&imgsys CLK_IMG_DIP>; + clock-names = + "DIP_CG_IMG_LARB5", + "DIP_CG_IMG_DIP"; + }; + vdecsys: syscon@16000000 { compatible = "mediatek,mt8183-vdecsys", "syscon"; reg = <0 0x16000000 0 0x1000>;
Signature · 1 line
2.18.0
RFC PATCH 5/6 media: platform: Add Mediatek DIP driver KConfig
In reply to Frederic ChenThis patch adds KConfig for Mediatek Digital Image Processing driver(DIP). DIP is embedded in Mediatek SoCs. It provides image format conversion, resizing, and rotation function.
--- drivers/media/platform/Kconfig | 2 ++ drivers/media/platform/mtk-isp/Kconfig | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 drivers/media/platform/mtk-isp/Kconfig
drivers/media/platform/Kconfig +2 -0
@@ -32,6 +32,8 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/omap/Kconfig" +source "drivers/media/platform/mtk-isp/Kconfig" + config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" depends on VIDEO_V4L2
drivers/media/platform/mtk-isp/Kconfig new file +21 -0
@@ -0,0 +1,21 @@ +config VIDEO_MEDIATEK_ISP_DIP_SUPPORT + bool "Mediatek Digital Image Processing function" + select DMA_SHARED_BUFFER + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_CORE + select VIDEOBUF2_V4L2 + select VIDEOBUF2_MEMOPS + select VIDEOBUF2_VMALLOC + select MEDIA_CONTROLLER + + default n + help + Support the basic Digital Image Processing (DIP) driver. + + DIP driver provides image format conversion, resizing, + and rotation function through the low power hardware. + DIP also supports multiple output feature. It can + generate two or more output image with different effect + based on a single input image at the same time. +
Signature · 1 line
2.18.0
A message that is not in the archive (sent off-list or not yet received): 20190417104511.21514-1-frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]
RFC PATCH 6/6 platform: mtk-isp: Add Mediatek DIP driver
This patch adds the driver of Digital Image Processing (DIP) unit in Mediatek ISP system, providing image format conversion, resizing, and rotation features.
The mtk-isp directory will contain drivers for multiple IP blocks found in Mediatek ISP system. It will include ISP Pass 1 driver(CAM), sensor interface driver, DIP driver and face detection driver.
--- drivers/media/platform/mtk-isp/Makefile | 18 + .../media/platform/mtk-isp/isp_50/Makefile | 17 + .../platform/mtk-isp/isp_50/dip/Makefile | 32 + .../mtk-isp/isp_50/dip/mtk_dip-ctrl.c | 124 ++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.c | 1116 +++++++++++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.h | 321 ++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-hw.h | 167 ++ .../mtk-isp/isp_50/dip/mtk_dip-smem.c | 322 ++++ .../mtk-isp/isp_50/dip/mtk_dip-smem.h | 39 + .../platform/mtk-isp/isp_50/dip/mtk_dip-sys.c | 1384 +++++++++++++++++ .../mtk-isp/isp_50/dip/mtk_dip-v4l2.c | 1310 ++++++++++++++++ 11 files changed, 4850 insertions(+) create mode 100644 drivers/media/platform/mtk-isp/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
drivers/media/platform/mtk-isp/Makefile new file +18 -0
@@ -0,0 +1,18 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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. +# + +obj-$(CONFIG_VIDEO_MEDIATEK_ISP_COMMON) += common/ + +obj-y += isp_50/ + +obj-$(CONFIG_VIDEO_MEDIATEK_ISP_FD_SUPPORT) += fd/
drivers/media/platform/mtk-isp/isp_50/Makefile new file +17 -0
@@ -0,0 +1,17 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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. +# + +ifeq ($(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT),y) +obj-y += dip/ +endif +
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +32 -0
@@ -0,0 +1,32 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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. +# +$(info $(srctree)) +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-mdp3 + +obj-y += mtk_dip-sys.o + +# To provide alloc context managing memory shared +# between CPU and ISP coprocessor +mtk_dip_smem-objs := \ +mtk_dip-smem.o + +obj-y += mtk_dip_smem.o + +# Utilits to provide frame-based streaming model +# with v4l2 user interfaces +mtk_dip_util-objs := \ +mtk_dip-dev.o \ +mtk_dip-v4l2.o \ +mtk_dip-ctrl.o \ + +obj-y += mtk_dip_util.o
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +124 -0
124 lines not on this page · raw message
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +1116 -0
1,116 lines not on this page · raw message
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +321 -0
321 lines not on this page · raw message
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h new file +167 -0
167 lines not on this page · raw message
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c new file +322 -0
322 lines not on this page · raw message
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_SMEM_H_ +#define _MTK_DIP_SMEM_H_ + +#include <linux/dma-mapping.h> +#include <linux/device.h> + +struct mtk_dip_smem_dev { +struct device dev; +struct sg_table sgt; +struct page **smem_pages; +int num_smem_pages; +phys_addr_t smem_base; +dma_addr_t smem_dma_base; +int smem_size; +}; + +phys_addr_t mtk_dip_smem_iova_to_phys (struct mtk_dip_smem_dev *smem_dev, +dma_addr_t iova); +int mtk_dip_smem_alloc_dev_init (struct mtk_dip_smem_dev *smem_dev, +struct device *default_alloc_dev); +void mtk_dip_smem_alloc_dev_release (struct mtk_dip_smem_dev *smem_dev); + +#endif /*_MTK_DIP_SMEM_H_*/ +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1384 -0
844 lines not on this page · raw message
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1310 -0
1,310 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.18.0
Part of the diff is not shown here. View the raw message.
A message that is not in the archive (sent off-list or not yet received): 20190417104511.21514-7-frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Hi Frederic,
Quoted 27 lines · Frederic Chen
This patch adds the driver of Digital Image Processing (DIP) unit in Mediatek ISP system, providing image format conversion, resizing, and rotation features.
The mtk-isp directory will contain drivers for multiple IP blocks found in Mediatek ISP system. It will include ISP Pass 1 driver(CAM), sensor interface driver, DIP driver and face detection driver.
--- drivers/media/platform/mtk-isp/Makefile | 18 + .../media/platform/mtk-isp/isp_50/Makefile | 17 + .../platform/mtk-isp/isp_50/dip/Makefile | 32 + .../mtk-isp/isp_50/dip/mtk_dip-ctrl.c | 124 ++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.c | 1116 +++++++++++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.h | 321 ++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-hw.h | 167 ++ .../mtk-isp/isp_50/dip/mtk_dip-smem.c | 322 ++++ .../mtk-isp/isp_50/dip/mtk_dip-smem.h | 39 + .../platform/mtk-isp/isp_50/dip/mtk_dip-sys.c | 1384 +++++++++++++++++ .../mtk-isp/isp_50/dip/mtk_dip-v4l2.c | 1310 ++++++++++++++++ 11 files changed, 4850 insertions(+) create mode 100644 drivers/media/platform/mtk-isp/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/Makefile
Quoted 9 lines
create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Thanks for the patch. Please see my comments inline.
Note that I'm reviewing from the bottom up, as it seems to be easier to follow the driver flow this way. This means that some comments higher in my reply may have more context lower in my reply. Please make sure to read all the comments first before seeking further clarification.
Quoted 36 lines
drivers/media/platform/mtk-isp/Makefile new file +18
-0@@ -0,0 +1,18 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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. +# + +obj-$(CONFIG_VIDEO_MEDIATEK_ISP_COMMON) += common/ + +obj-y += isp_50/ + +obj-$(CONFIG_VIDEO_MEDIATEK_ISP_FD_SUPPORT) += fd/drivers/media/platform/mtk-isp/isp_50/Makefile new file +6
-0@@ -0,0 +1,17 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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.
drivers/media/platform/mtk-isp/isp_50/Makefile line 16
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/Makefile new file +10
-0+# +# 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. +# + +ifeq ($(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT),y) +obj-y += dip/ +endif
Why not just obj-$(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT)?
Also, the "_SUPPORT" suffix in the config option name is meaningless, please remove it.
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/Makefile new file +1
-0+drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +6
-0@@ -0,0 +1,32 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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.
drivers/media/platform/mtk-isp/isp_50/dip/Makefile line 16
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +10
-0+# +# 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. +# +$(info $(srctree)) +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-mdp3 + +obj-y += mtk_dip-sys.o
obj-$(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT)
drivers/media/platform/mtk-isp/isp_50/dip/Makefile line 23
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +7
-0+ +# To provide alloc context managing memory shared +# between CPU and ISP coprocessor +mtk_dip_smem-objs := \ +mtk_dip-smem.o + +obj-y += mtk_dip_smem.o
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/Makefile line 32
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +9
-0+ +# Utilits to provide frame-based streaming model +# with v4l2 user interfaces +mtk_dip_util-objs := \ +mtk_dip-dev.o \ +mtk_dip-v4l2.o \ +mtk_dip-ctrl.o \ + +obj-y += mtk_dip_util.o
Ditto.
Quoted 73 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +67
-0@@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/device.h> +#include <linux/platform_device.h> +#include "mtk_dip-dev.h" + +static void handle_buf_usage_config (struct v4l2_ctrl *ctrl) +{ +struct mtk_dip_video_device *node = +container_of (ctrl->handler, + struct mtk_dip_video_device, ctrl_handler); + +if (ctrl->val < MTK_DIP_V4l2_BUF_USAGE_DEFAULT || + ctrl->val >= MTK_DIP_V4l2_BUF_USAGE_NONE) { +pr_err ("Invalid buffer usage id %d" , ctrl->val); +return ; + } + node->dev_q.buffer_usage = ctrl->val; +} + +static void handle_buf_rotate_config (struct v4l2_ctrl *ctrl) +{ +struct mtk_dip_video_device *node = +container_of (ctrl->handler, + struct mtk_dip_video_device, ctrl_handler); + +if (ctrl->val !=0 || ctrl->val !=90 || + ctrl->val !=180 || ctrl->val !=270 ) { +pr_err ("Invalid buffer rotation %d" , ctrl->val); +return ; + } + node->dev_q.rotation = ctrl->val; +} + +static int mtk_dip_video_device_s_ctrl (struct v4l2_ctrl *ctrl) +{ +switch (ctrl->id) { +case V4L2_CID_PRIVATE_SET_BUFFER_USAGE : +handle_buf_usage_config (ctrl); +break ; +case V4L2_CID_ROTATE : +handle_buf_rotate_config (ctrl); +break ; +default : +break ; + } +return 0 ; +} + +static const struct v4l2_ctrl_ops mtk_dip_video_device_ctrl_ops = { + .s_ctrl = mtk_dip_video_device_s_ctrl, +}; + +static const struct v4l2_ctrl_config mtk_dip_buf_usage_config = {
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c line 77
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +10
-0+ .ops = &mtk_dip_video_device_ctrl_ops, + .id = V4L2_CID_PRIVATE_SET_BUFFER_USAGE, + .name = "MTK ISP SET BUFFER USAGE", + .type = V4L2_CTRL_TYPE_INTEGER, + .min = MTK_DIP_V4l2_BUF_USAGE_DEFAULT, + .max = MTK_DIP_V4l2_BUF_USAGE_POSTPROC, + .step = 1, + .def = MTK_DIP_V4l2_BUF_USAGE_DEFAULT, + .flags = V4L2_CTRL_FLAG_SLIDER | V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, + };
What is this control for?
It looks like it selects which DMA should a buffer go to? If so, that's not the right way to do it. Each DMA port should have its corresponding /dev/video node and to which video node the buffer is queued determines to which hardware DMA it goes.
Quoted 204 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +47
-0+ +int mtk_dip_ctrl_init (struct mtk_dip_pipe *dip_pipe) +{ +struct v4l2_ctrl_handler *hdl = &dip_pipe->ctrl_handler; +struct mtk_dip_video_device *node; +int i; +int img_nodes_to_be_init[3 ] = { +MTK_DIP_VIDEO_NODE_ID_RAW_OUT , +MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE , +MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE + }; + +v4l2_ctrl_handler_init (hdl,V4L2_CID_MTK_DIP_MAX ); + +pr_debug ("%s init ctrl: %p\n" , __func__, hdl); + +if (hdl->error) { +pr_err ("Failed in v4l2_ctrl_handler_init\n" ); +return hdl->error; + } + +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) +v4l2_ctrl_handler_init (&dip_pipe->nodes[i].ctrl_handler, +V4L2_CID_MTK_DIP_MAX ); + +for (i =0 ; i <ARRAY_SIZE (img_nodes_to_be_init); i++) { + node = &dip_pipe->nodes[img_nodes_to_be_init[i]]; + +if (v4l2_ctrl_new_custom (&node->ctrl_handler, + &mtk_dip_buf_usage_config, +NULL ) ==NULL ) +dev_err (&dip_pipe->dip_dev->pdev->dev, +"Node(%s) create buf_usage_config ctrl failed:(%d)" , + node->desc->name, + node->ctrl_handler.error); + +if (v4l2_ctrl_new_std (&dip_pipe->ctrl_handler, + &mtk_dip_video_device_ctrl_ops, +V4L2_CID_ROTATE ,0 ,270 ,90 ,0 ) ==NULL ) +dev_err (&dip_pipe->dip_dev->pdev->dev, +"Node(%s) create rotate ctrl failed:(%d)" , + node->desc->name, node->ctrl_handler.error); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (mtk_dip_ctrl_init);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +151
-0@@ -0,0 +1,1116 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/module.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <media/videobuf2-dma-contig.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <media/videobuf2-dma-contig.h> +#include <linux/dma-mapping.h> +#include <media/v4l2-event.h> +#include "mtk_dip-dev.h" +#include "mtk_dip-smem.h" +#include "mtk-mdp3-regs.h" +#include "mtk-img-ipi.h" + +int mtk_dip_pipe_init (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_dev *dip_dev, +struct mtk_dip_pipe_desc *setting, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev, +struct mtk_dip_smem_dev *smem_alloc_dev) +{ +int ret, i; + + dip_pipe->dip_dev = dip_dev; + dip_pipe->desc = setting; + dip_pipe->smem_alloc_dev = smem_alloc_dev; + +atomic_set (&dip_pipe->pipe_job_sequence,0 ); +spin_lock_init (&dip_pipe->job_lock); +mutex_init (&dip_pipe->lock); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev,"init pipe(%s,%d)\n" , + dip_pipe->desc->name, + dip_pipe->desc->id); + + dip_pipe->num_nodes =MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; + +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM ; i++) { + dip_pipe->nodes[i].desc = + &dip_pipe->desc->output_queue_descs[i]; + dip_pipe->nodes[i].immutable =0 ; + dip_pipe->nodes[i].enabled = + dip_pipe->nodes[i].desc->default_enable; +atomic_set (&dip_pipe->nodes[i].sequence,0 ); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: init node(%s,%d)\n" , + dip_pipe->desc->name, + dip_pipe->nodes[i].desc->name, i); + } + +for (i =MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM ; + i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +int cap_idx = i -MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM ; + + dip_pipe->nodes[i].desc = + &dip_pipe->desc->capture_queue_descs[cap_idx]; + dip_pipe->nodes[i].immutable =0 ; + dip_pipe->nodes[i].enabled = + dip_pipe->nodes[i].desc->default_enable; +atomic_set (&dip_pipe->nodes[i].sequence,0 ); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: init node(%s,%d)\n" , + dip_pipe->desc->name, + dip_pipe->nodes[i].desc->name, i); + } + +if (dip_pipe->desc->master >=0 && + dip_pipe->desc->master <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ) { + dip_pipe->nodes[dip_pipe->desc->master].immutable =1 ; + dip_pipe->nodes[dip_pipe->desc->master].enabled =1 ; + } + + ret =mtk_dip_ctrl_init (dip_pipe); + +if (ret) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: failed(%d) to initialize ctrls\n" , + dip_pipe->desc->name, ret); + goto failed_ctrl; + } + + ret =mtk_dip_pipe_v4l2_register (dip_pipe, media_dev, v4l2_dev); + +if (ret) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: failed(%d) to create V4L2 devices\n" , + dip_pipe->desc->name, ret); + goto failed_pipe; + } + +return 0 ; + +failed_ctrl: +failed_pipe: +mutex_destroy (&dip_pipe->lock); +return ret; +} + +static int mtk_dip_pipe_next_job_id (struct mtk_dip_pipe *dip_pipe) +{ +int global_job_id = +atomic_inc_return (&dip_pipe->pipe_job_sequence); + + global_job_id = + (global_job_id &0x0000FFFF ) | + (dip_pipe->desc->id <<16 ); + +return global_job_id; +} + +int mtk_dip_pipe_init_job_infos (struct mtk_dip_pipe *dip_pipe) +{ +int i; + +spin_lock (&dip_pipe->job_lock); + + dip_pipe->num_pipe_job_infos =ARRAY_SIZE (dip_pipe->pipe_job_infos); +INIT_LIST_HEAD (&dip_pipe->pipe_job_running_list); +INIT_LIST_HEAD (&dip_pipe->pipe_job_free_list); + +for (i =0 ; i < dip_pipe->num_pipe_job_infos; i++) { +struct mtk_dip_pipe_job_info *pipe_job_info = + &dip_pipe->pipe_job_infos[i]; +list_add_tail (&pipe_job_info->list, + &dip_pipe->pipe_job_free_list); + } + +spin_unlock (&dip_pipe->job_lock); + +return 0 ; +} + +static int mtk_dip_pipe_process_pipe_job_info (struct mtk_dip_pipe *dip_pipe, + struct mtk_dip_pipe_job_info
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 161
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ *pipe_job_info) +{ +spin_lock (&dip_pipe->job_lock); + +list_del (&pipe_job_info->list); +list_add_tail (&pipe_job_info->list, &dip_pipe->pipe_job_running_list); + +spin_unlock (&dip_pipe->job_lock); +return 0 ; +}
This function is also only called once, is very small and can't fail, so I don't see any advantage over just moving its contents there.
Quoted 60 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +60
-0+ +struct mtk_dip_pipe_job_info * +mtk_dip_pipe_get_running_job_info (struct mtk_dip_pipe *dip_pipe, +int pipe_job_id) +{ +struct mtk_dip_pipe_job_info *pipe_job_info =NULL ; + +spin_lock (&dip_pipe->job_lock); + +list_for_each_entry (pipe_job_info, + &dip_pipe->pipe_job_running_list, list) { +if (pipe_job_info->id == pipe_job_id) { +spin_unlock (&dip_pipe->job_lock); +return pipe_job_info; + } + } + +spin_unlock (&dip_pipe->job_lock); + +return NULL ; +} + +static int +mtk_dip_pipe_free_job_info (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +spin_lock (&dip_pipe->job_lock); + +list_del (&pipe_job_info->list); +list_add_tail (&pipe_job_info->list, &dip_pipe->pipe_job_free_list); + +spin_unlock (&dip_pipe->job_lock); + +return 0 ; +} + +static struct mtk_dip_pipe_job_info * +mtk_dip_pipe_get_free_job_info (struct mtk_dip_pipe *dip_pipe) +{ +struct mtk_dip_pipe_job_info *pipe_job_info =NULL ; + +spin_lock (&dip_pipe->job_lock); +list_for_each_entry (pipe_job_info, + &dip_pipe->pipe_job_free_list, list) { +dev_dbg (&dip_pipe->dip_dev->pdev->dev,"Found free pipe job\n" ); +spin_unlock (&dip_pipe->job_lock); +return pipe_job_info; + } +spin_unlock (&dip_pipe->job_lock); + +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: can't found free pipe job\n" , + dip_pipe->desc->name); + +return NULL ; +} + +static void +mtk_dip_pipe_update_job_info(struct mtk_dip_pipe *dip_pipe, + struct mtk_dip_pipe_job_info *pipe_job_info,
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 231
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ struct mtk_dip_video_device *node, + struct mtk_dip_dev_buffer *dev_buf) +{ +if (!pipe_job_info || !dev_buf || !node) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: update pipe-job(%p) failed, buf(%p),node(%p)\n" , + dip_pipe->desc->name, + pipe_job_info, dev_buf, node); +return ; + }
This function is only called in once place and all the arguments there can't be NULL. This check is useless.
I'd recommend moving this function lower, closer to where it's called from.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+ +if (pipe_job_info->buf_map[node->desc->id]) +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: buf overwrite\n" , + dip_pipe->desc->name, + node->desc->name);a
This is also impossible to happen.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 249
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +12
-0+ +if (node->desc->buf_type ==V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) + pipe_job_info->num_img_capture_bufs++; + +if (node->desc->buf_type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) + pipe_job_info->num_img_output_bufs++; + +if (node->desc->buf_type ==V4L2_BUF_TYPE_META_OUTPUT ) + pipe_job_info->num_meta_output_bufs++; +` +if (node->desc->buf_type ==V4L2_BUF_TYPE_META_CAPTURE ) + pipe_job_info->num_meta_capture_bufs++;
These two counters seem to be only used for debugging messages. I don't think there is any good use for them. We should have a generic debug message for the request queue operation, printing the request objects there. Please remove.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 251
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + pipe_job_info->buf_map[node->desc->id] = dev_buf;
Given that with my other comments, we reduce this function to only a few lines, I'd just suggest moving this line to the place this function is currently being called from.
Quoted 34 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +34
-0+ +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: added buf(%p) to pipe-job(%p)\n" , + dip_pipe->desc->name, node->desc->name, dev_buf, + pipe_job_info); +} + +static void mtk_dip_pipe_debug_job (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +int i; + +if (!dip_pipe || !pipe_job_info) +return ; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: pipe-job(%p),id(%d),req(%p)buf nums(%d,%d,%d,%d)\n" , + dip_pipe->desc->name, + pipe_job_info, + pipe_job_info->id, + pipe_job_info->req, + pipe_job_info->num_img_capture_bufs, + pipe_job_info->num_img_output_bufs, + pipe_job_info->num_meta_capture_bufs, + pipe_job_info->num_meta_output_bufs); + +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +if (pipe_job_info->buf_map[i]) +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Node(%s,%d), buf(%p)\n" , + dip_pipe->nodes[i].desc->name, i, + pipe_job_info->buf_map[i]); + } +}
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 295
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ +int mtk_dip_pipe_job_finish (struct mtk_dip_pipe *dip_pipe, +unsigned int pipe_job_info_id, +enum vb2_buffer_state vbf_state) +{ +int i; +struct mtk_dip_pipe_job_info *job_info =NULL ; +const int pipe_id = +mtk_dip_pipe_get_pipe_from_job_id (pipe_job_info_id); +u64 timestamp =0 ;
Unnecessary initialization.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+ +if (!dip_pipe) +pr_err ("%s: pipe-job id(%d) release failed, dip_pipe is null\n" , + __func__, pipe_job_info_id);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 309
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ + job_info =mtk_dip_pipe_get_running_job_info (dip_pipe, + pipe_job_info_id); + +if (!job_info) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: can't find pipe-job id(%d)\n" , + __func__, dip_pipe->desc->name, pipe_id); +return -EINVAL ; + }
None of the 2 conditions above should be possible to happen.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 311
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + timestamp =ktime_get_ns ();
This timestamp is unused.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 318
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +struct mtk_dip_dev_buffer *dev_buf = job_info->buf_map[i]; + +if (!dev_buf) { +continue ; + }else {
No need to put this code under else.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 319
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +1
-0+ dev_buf->vbb.vb2_buf.timestamp =ktime_get_ns ();
Did you mean to use the timestamp variable here?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 321
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+mtk_dip_v4l2_buffer_done (&dev_buf->vbb.vb2_buf, + vbf_state);
Just call vb2_buffer_done() directly, as pointed in another comment.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +11
-0+ } + } + +mtk_dip_pipe_free_job_info (dip_pipe, job_info); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: finish pipe-job, id(%d), vb state(%d)\n" , + __func__, dip_pipe->desc->name, pipe_id, + pipe_job_info_id, vbf_state); + +return 0 ;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 342
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+} + +static void mtk_dip_dev_buf_fill_info (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_dev_buffer *dev_buf) +{ +struct vb2_v4l2_buffer *b; +struct mtk_dip_video_device *node; +struct mtk_dip_video_device_desc *desc; + + b = &dev_buf->vbb;
We can just have this together with the declaration.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 344
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ node =mtk_dip_vbq_to_node (b->vb2_buf.vb2_queue); + desc = node->desc;
I don't see too much savings from having a local variable for this over just using node->desc directly.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 349
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+ dev_buf->fmt = node->vdev_fmt; + dev_buf->dev_fmt = node->dev_q.dev_fmt; + dev_buf->isp_daddr = +vb2_dma_contig_plane_dma_addr (&b->vb2_buf,0 ); + dev_buf->vaddr =vb2_plane_vaddr (&b->vb2_buf,0 );
Why do we need a virtual address? Note that depending on how the buffer was allocated, this may not be a cheap operation, e.g. it may involve creating actual CPU mapping at the point of the first call to vb2_plane_vaddr(), which is costly.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 350
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +1
-0+ dev_buf->buffer_usage = node->dev_q.buffer_usage;
There should be no buffer_usage, but rather separate queue for each usage.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 357
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ dev_buf->rotation = node->dev_q.rotation; + +if (desc->smem_alloc) { + dev_buf->scp_daddr = +mtk_dip_smem_iova_to_phys + (dip_pipe->smem_alloc_dev, + dev_buf->isp_daddr);
Isn't this overly wrapped? The first argument should fit in the second line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 360
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +3
-0+ }else { + dev_buf->scp_daddr =0 ; + }
Things like DMA addresses should be initialized in the .buf_init vb2 callback, which is only called once the backing memory of the buffer changes.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+ + dev_dbg(&dip_pipe->dip_dev->pdev->dev, + "%s:%s: buf type(%d), idx(%d), mem(%d), isp_daddr(%p), scp_daddr(%p)\n", + dip_pipe->desc->name,
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 374
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ desc->name, + b->vb2_buf.type, + b->vb2_buf.index, + b->vb2_buf.memory, + dev_buf->isp_daddr, + dev_buf->scp_daddr); +} + +int mtk_dip_pipe_queue_buffers (struct media_request *req, +int initial)
This seems to be always called with initial == 0. Please remove the dead argument and related code paths.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 379
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+{ +struct media_request_object *obj; +struct mtk_dip_pipe *dip_pipe; +struct mtk_dip_pipe_job_info *pipe_job_info =NULL ; +int ret =0 ;
Unnecessary initialization.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 384
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+ +list_for_each_entry (obj, &req->objects, list) { +struct vb2_buffer *vb; + +if (vb2_request_object_is_buffer (obj)) {
Please invert the condition and use the continue statement to make the code less indented.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+struct mtk_dip_dev_buffer *buf; +struct mtk_dip_dev_buffer *dev_buf; +struct mtk_dip_video_device *node; + + vb = container_of(obj, struct vb2_buffer, req_obj); + node =mtk_dip_vbq_to_node (vb->vb2_queue);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 400
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ dip_pipe =vb2_get_drv_priv (vb->vb2_queue); + dev_buf =mtk_dip_vb2_buf_to_dev_buf (vb); + buf = dev_buf; + +if (!pipe_job_info) { + pipe_job_info =mtk_dip_pipe_get_free_job_info + (dip_pipe); + +if (!pipe_job_info) + goto FAILE_JOB_NOT_TRIGGER;
Labels should be lower case.
Generally, we already validated the request and know that there are buffers there, so we can just move this before the loop.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 407
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ +memset (pipe_job_info->buf_map,0 , +sizeof (pipe_job_info->buf_map)); + pipe_job_info->num_img_capture_bufs =0 ; + pipe_job_info->num_img_output_bufs =0 ; + pipe_job_info->num_meta_capture_bufs =0 ; + pipe_job_info->num_meta_output_bufs =0 ;
Couldn't mtk_dip_pipe_get_free_job_info() initialize these for us?
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+ } + +mtk_dip_dev_buf_fill_info (dip_pipe, + buf);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 421
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ +mtk_dip_pipe_update_job_info (dip_pipe, + pipe_job_info, + node, + buf); + } + } + +if (!pipe_job_info) +return -EINVAL ;
This function is called from request queue callback, so it can't return an error. If it fails here for some reason, it should return any matching buffers with error state and complete the request.
I'd still recommend designing this in a way that request queuing can't fail anymore. For example, we can implement our own .req_alloc in media_device_ops and wrap the generic media_request struct into our mtk_dip_request struct that would include any data that currently mtk_dip_pipe_job_info has. Then, we wouldn't have a way to run out of free job info structs and so no more reason to fail here.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+ + pipe_job_info->id = +mtk_dip_pipe_next_job_id (dip_pipe); +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 435
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+mtk_dip_pipe_debug_job (dip_pipe, pipe_job_info); + +mutex_lock (&dip_pipe->lock); + +if (!dip_pipe->streaming) { +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: stream is off, no hw enqueue triggered\n" , + __func__, dip_pipe->desc->name); +mutex_unlock (&dip_pipe->lock); +return 0 ;
We should be able to leverage vb2 for protecting us from this. I just realized this issue comes from the bad request handling in mtk_dip_vb2_request_queue(). I added a more detailed comment there.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ } + +if (mtk_dip_pipe_process_pipe_job_info (dip_pipe, pipe_job_info)) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: can't start to run pipe job id(%d)\n" , + __func__, dip_pipe->desc->name, + pipe_job_info->id); +mutex_unlock (&dip_pipe->lock);a
Wouldn't it make sense to add a label called err_unlock and unlock the mutex there?
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ goto FAILE_JOB_NOT_TRIGGER; + } + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: trigger pipe job, id(%d)\n" , + dip_pipe->desc->name, + dip_pipe->desc->id); +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 461
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+if (mtk_dip_pipe_job_start (dip_pipe, pipe_job_info)) { +mutex_unlock (&dip_pipe->lock); + goto FAILE_JOB_NOT_TRIGGER; + } + +mutex_unlock (&dip_pipe->lock); + +return 0 ; + +FAILE_JOB_NOT_TRIGGER:
Labels should be lowercase and named after the first clean up step that happens after the jump.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 466
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+if (initial) +return ret; + +mtk_dip_pipe_job_finish (dip_pipe, pipe_job_info->id, +VB2_BUF_STATE_ERROR );
We jump here from above if mtk_dip_pipe_get_free_job_info() returns NULL, so this is going to nicely crash on a NULL pointer dereference. Do we actually need to jump here from there, rather than just instantly returning an error?
Quoted 195 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +195
-0+ +return -EINVAL ; +} + +int mtk_dip_pipe_release (struct mtk_dip_pipe *dip_pipe) +{ +mtk_dip_pipe_v4l2_unregister (dip_pipe); +v4l2_ctrl_handler_free (&dip_pipe->ctrl_handler); +mutex_destroy (&dip_pipe->lock); + +return 0 ; +} + +static void set_img_fmt (struct v4l2_pix_format_mplane *mfmt_to_fill, +struct mtk_dip_dev_format *dev_fmt) +{ +int i; + + mfmt_to_fill->pixelformat = dev_fmt->fmt.img.pixelformat; + mfmt_to_fill->num_planes = dev_fmt->fmt.img.num_planes; + mfmt_to_fill->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + mfmt_to_fill->quantization =V4L2_QUANTIZATION_DEFAULT ; + mfmt_to_fill->colorspace = dev_fmt->fmt.img.colorspace; + +memset (mfmt_to_fill->reserved,0 ,sizeof (mfmt_to_fill->reserved)); + +pr_debug ("%s: Fmt(%d),w(%d),h(%d),f(%d)\n" , + __func__, + mfmt_to_fill->pixelformat, + mfmt_to_fill->width, + mfmt_to_fill->height, + mfmt_to_fill->field); + +for (i =0 ; i < mfmt_to_fill->num_planes; ++i) { +int bpl = (mfmt_to_fill->width * + dev_fmt->fmt.img.row_depth[i]) /8 ; +int sizeimage = (mfmt_to_fill->width * mfmt_to_fill->height * + dev_fmt->fmt.img.depth[i]) /8 ; + + mfmt_to_fill->plane_fmt[i].bytesperline = bpl; + mfmt_to_fill->plane_fmt[i].sizeimage = sizeimage; +memset (mfmt_to_fill->plane_fmt[i].reserved, +0 ,sizeof (mfmt_to_fill->plane_fmt[i].reserved)); + +pr_debug ("plane(%d):bpl(%d),sizeimage(%u)\n" , + i, bpl, + mfmt_to_fill->plane_fmt[i].sizeimage); + } +} + +static void set_meta_fmt (struct v4l2_meta_format *metafmt_to_fill, +struct mtk_dip_dev_format *dev_fmt) +{ + metafmt_to_fill->dataformat = dev_fmt->fmt.meta.dataformat; + +if (dev_fmt->fmt.meta.max_buffer_size <=0 ) { +pr_debug ("Invalid meta buf size(%u), use default(%u)\n" , + dev_fmt->fmt.meta.max_buffer_size, +MTK_DIP_DEV_META_BUF_DEFAULT_SIZE ); + metafmt_to_fill->buffersize =MTK_DIP_DEV_META_BUF_DEFAULT_SIZE ; + }else { +pr_debug ("Use meta size(%u)\n" , + dev_fmt->fmt.meta.max_buffer_size); + metafmt_to_fill->buffersize = dev_fmt->fmt.meta.max_buffer_size; + } +} + +void mtk_dip_pipe_load_default_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_format *fmt_to_fill) +{ +struct mtk_dip_dev_format *dev_fmt; +struct mtk_dip_video_device_desc *desc = node->desc; + +if (desc->num_fmts ==0 ) { +pr_err ("%s:%s: desc->num_fmts is 0, no format support list\n" , + __func__, desc->name); +return ; + } + +if (desc->default_fmt_idx >= desc->num_fmts) { +pr_debug ("%s:%s: invalid idx(%d), must < num_fmts(%d)\n" , + __func__, desc->name, desc->default_fmt_idx, + desc->num_fmts); + desc->default_fmt_idx =0 ; + } + + dev_fmt = &desc->fmts[desc->default_fmt_idx]; + fmt_to_fill->type = desc->buf_type; +if (mtk_dip_buf_is_meta (desc->buf_type)) { +set_meta_fmt (&fmt_to_fill->fmt.meta, dev_fmt); + }else { + fmt_to_fill->fmt.pix_mp.width = desc->default_width; + fmt_to_fill->fmt.pix_mp.height = desc->default_height; + fmt_to_fill->fmt.pix_mp.field =V4L2_FIELD_NONE ; + +set_img_fmt (&fmt_to_fill->fmt.pix_mp, dev_fmt); + } +} + +struct mtk_dip_dev_format * +mtk_dip_pipe_find_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +u32 format) +{ +int i; +struct mtk_dip_dev_format *dev_fmt; + +struct mtk_dip_video_device_desc *desc = node->desc; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev,"fmt to find(%x)\n" , format); + +for (i =0 ; i < desc->num_fmts; i++) { + dev_fmt = &desc->fmts[i]; +if (!mtk_dip_buf_is_meta (desc->buf_type)) { +if (dev_fmt->fmt.img.pixelformat == format) +return dev_fmt; + }else { +if (dev_fmt->fmt.meta.dataformat == format) +return dev_fmt; + } + } + +return NULL ; +} + +int mtk_dip_pipe_set_meta_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_meta_format *user_fmt, +struct v4l2_meta_format *node_fmt) +{ +struct mtk_dip_dev_format *dev_fmt; + +if (!user_fmt || !node_fmt) +return -EINVAL ; + + dev_fmt =mtk_dip_pipe_find_fmt (dip_pipe, node, + user_fmt->dataformat); + +if (!dev_fmt) +return -EINVAL ; + + node->dev_q.dev_fmt = dev_fmt; +set_meta_fmt (node_fmt, dev_fmt); + *user_fmt = *node_fmt; + +return 0 ; +} + +int mtk_dip_pipe_set_img_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_pix_format_mplane *user_fmt, +struct v4l2_pix_format_mplane *dest_fmt) +{ +struct mtk_dip_dev_format *dev_fmt; + +if (!user_fmt || !dest_fmt) +return -EINVAL ; + + dev_fmt =mtk_dip_pipe_find_fmt (dip_pipe, node, + user_fmt->pixelformat); + +if (!dev_fmt) { +pr_debug ("%s:%s:%s: dev_fmt(%d) not found\n" , + __func__, dip_pipe->desc->name, + node->desc->name, user_fmt->pixelformat); +return -EINVAL ; + } + + node->dev_q.dev_fmt = dev_fmt; + dest_fmt->width = user_fmt->width; + dest_fmt->height = user_fmt->height; + dest_fmt->field =V4L2_FIELD_NONE ; + +set_img_fmt (dest_fmt, dev_fmt); + +return 0 ; +} + +int mtk_dip_pipe_streamon (struct mtk_dip_pipe *dip_pipe) +{ +int ret; +struct mtk_dip_dev *dip_dev; + +if (!dip_pipe) +return -EINVAL ; + + dip_dev =dev_get_drvdata (&dip_pipe->dip_dev->pdev->dev); + +mutex_lock (&dip_pipe->lock); + + ret =mtk_dip_hw_streamon (&dip_dev->dip_hw, + dip_pipe->desc->id); + +if (ret) {
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 671
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s:%s:%d: failed to start hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); +mutex_unlock (&dip_pipe->lock); +return -EBUSY ; + } + + dip_pipe->streaming =1 ; +mutex_unlock (&dip_pipe->lock);
Shouldn't we also check if there isn't anything to queue to the hardware at this point? We might have been given buffers and requests before starting streaming on all the nodes. It should be relatively easy, if you follow my suggestion to redesign the request handling in another comment, i.e. you should be able to just call the mtk_dip_pipe_try_enqueue() function here.
(That call could be placed in mtk_dip_hw_streamon() as well, if we remove this function as suggested in my other comment.)
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 679
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s:%d: start hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); + +return ret; +}
Similar comments for this function as for the one below.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 687
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ +int mtk_dip_pipe_streamoff (struct mtk_dip_pipe *dip_pipe) +{ +int ret; +struct mtk_dip_dev *dip_dev; + +if (!dip_pipe) +return -EINVAL ;
How could this happen?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 689
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + dip_dev =dev_get_drvdata (&dip_pipe->dip_dev->pdev->dev);
Hold on, isn't dip_pipe->dip_dev just what we're looking for here?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 697
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ +mutex_lock (&dip_pipe->lock); + + ret =mtk_dip_hw_streamoff (&dip_dev->dip_hw, + dip_pipe->desc->id); + +if (ret) { + dev_err(&dip_pipe->dip_dev->pdev->dev,
We already have a direct pointer to dip_dev, no need to go through dip_pipe again. Also, it sounds like simply storing a pointer to dev, rather pdev in dip_dev would make more sense.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 702
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+"%s:%s:%d: failed to stop hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); +mutex_unlock (&dip_pipe->lock); +return -EBUSY ;
We must never end up in such case. If for some reason the hardware fails to stop normally, we must forcefully stop it (e.g. reset), since any memory and other resources are expected to be freed after streaming stops.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 714
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +12
-0+ } + + dip_pipe->streaming =0 ; +mutex_unlock (&dip_pipe->lock); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s:%d: stop hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); + +return 0 ; +}
The 2 functions above could be easily merged into mtk_dip_subdev_s_stream(), which could call mtk_dip_hw_stream{off,on}() directly.
Quoted 153 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +153
-0+ +static enum mdp_ycbcr_profile +map_ycbcr_prof_mplane (struct v4l2_pix_format_mplane *pix_mp, +u32 mdp_color) +{ +if (MDP_COLOR_IS_RGB (mdp_color)) +return MDP_YCBCR_PROFILE_FULL_BT601 ; + +switch (pix_mp->colorspace) { +case V4L2_COLORSPACE_JPEG : +return MDP_YCBCR_PROFILE_JPEG ; +case V4L2_COLORSPACE_REC709 : +case V4L2_COLORSPACE_DCI_P3 : +if (pix_mp->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) +return MDP_YCBCR_PROFILE_FULL_BT709 ; +return MDP_YCBCR_PROFILE_BT709 ; +case V4L2_COLORSPACE_BT2020 : +if (pix_mp->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) +return MDP_YCBCR_PROFILE_FULL_BT2020 ; +return MDP_YCBCR_PROFILE_BT2020 ; + } +/* V4L2_COLORSPACE_SRGB or else */ +if (pix_mp->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) +return MDP_YCBCR_PROFILE_FULL_BT601 ; +return MDP_YCBCR_PROFILE_BT601 ; +} + +/* Stride that is accepted by MDP HW */ +static u32 dip_mdp_fmt_get_stride (const struct mtk_dip_dev_mdp_format *fmt, +u32 bytesperline, +unsigned int plane) +{ +enum mdp_color c = fmt->mdp_color; +u32 stride; + + stride = (bytesperline *MDP_COLOR_BITS_PER_PIXEL (c)) + / fmt->row_depth[0 ]; +if (plane ==0 ) +return stride; +if (plane <MDP_COLOR_GET_PLANE_COUNT (c)) { +if (MDP_COLOR_IS_BLOCK_MODE (c)) + stride = stride /2 ; +return stride; + } +return 0 ; +} + +/* Stride that is accepted by MDP HW of format with contiguous planes */ +static u32 +dip_mdp_fmt_get_stride_contig (const struct mtk_dip_dev_mdp_format *fmt, +u32 pix_stride, +unsigned int plane) +{ +enum mdp_color c = fmt->mdp_color; +u32 stride = pix_stride; + +if (plane ==0 ) +return stride; +if (plane <MDP_COLOR_GET_PLANE_COUNT (c)) { + stride = stride >>MDP_COLOR_GET_H_SUBSAMPLE (c); +if (MDP_COLOR_IS_UV_COPLANE (c) && !MDP_COLOR_IS_BLOCK_MODE (c)) + stride = stride *2 ; +return stride; + } +return 0 ; +} + +/* Plane size that is accepted by MDP HW */ +static u32 +dip_mdp_fmt_get_plane_size (const struct mtk_dip_dev_mdp_format *fmt, +u32 stride,u32 height, +unsigned int plane) +{ +enum mdp_color c = fmt->mdp_color; +u32 bytesperline; + + bytesperline = (stride * fmt->row_depth[0 ]) + /MDP_COLOR_BITS_PER_PIXEL (c); +if (plane ==0 ) +return bytesperline * height; +if (plane <MDP_COLOR_GET_PLANE_COUNT (c)) { + height = height >>MDP_COLOR_GET_V_SUBSAMPLE (c); +if (MDP_COLOR_IS_BLOCK_MODE (c)) + bytesperline = bytesperline *2 ; +return bytesperline * height; + } +return 0 ; +} + +static int is_contig_mp_buffer (struct mtk_dip_dev_buffer *dev_buf) +{ +if (MDP_COLOR_GET_PLANE_COUNT (dev_buf->dev_fmt->fmt.img.mdp_color) + ==1 ) +return 0 ; +else +return 1 ; +} + +static int fill_ipi_img_param_mp (struct mtk_dip_pipe *dip_pipe, +struct img_image_buffer *b, +struct mtk_dip_dev_buffer *dev_buf, +char *buf_name) +{ +struct v4l2_pix_format_mplane *pix_mp; +struct mtk_dip_dev_mdp_format *mdp_fmt; +unsigned int i; +unsigned int total_plane_size =0 ; + +if (!dev_buf || !dev_buf->dev_fmt) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: %s's dev format not set\n" , + __func__, buf_name); +return -EINVAL ; + } + + pix_mp = &dev_buf->fmt.fmt.pix_mp; + mdp_fmt = &dev_buf->dev_fmt->fmt.img; + + b->format.colorformat = dev_buf->dev_fmt->fmt.img.mdp_color; + b->format.width = dev_buf->fmt.fmt.pix_mp.width; + b->format.height = dev_buf->fmt.fmt.pix_mp.height; + b->format.ycbcr_prof = +map_ycbcr_prof_mplane (pix_mp, + dev_buf->dev_fmt->fmt.img.mdp_color); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: buf(%s), IPI: w(%d),h(%d),c(0x%x)\n" , + dip_pipe->desc->name, + buf_name, + b->format.width, + b->format.height, + b->format.colorformat); + +for (i =0 ; i < pix_mp->num_planes; ++i) { +u32 stride = +dip_mdp_fmt_get_stride + (mdp_fmt, pix_mp->plane_fmt[i].bytesperline, i); + + b->format.plane_fmt[i].stride = stride; + b->format.plane_fmt[i].size = +dip_mdp_fmt_get_plane_size (mdp_fmt, + stride, + pix_mp->height, i); + b->iova[i] = dev_buf->isp_daddr; +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Contiguous-mp-buf:plane(%i),stride(%d),size(%d),iova(%p)" , + i, + b->format.plane_fmt[i].stride, + b->format.plane_fmt[i].size, + b->iova[i]); + total_plane_size = b->format.plane_fmt[i].size; + } +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 877
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+for (; i <MDP_COLOR_GET_PLANE_COUNT (b->format.colorformat); ++i) { +u32 stride = +dip_mdp_fmt_get_stride_contig + (mdp_fmt, b->format.plane_fmt[0 ].stride, i); + + b->format.plane_fmt[i].stride = stride; + b->format.plane_fmt[i].size = +dip_mdp_fmt_get_plane_size (mdp_fmt, stride, + pix_mp->height, i); + b->iova[i] = b->iova[i -1 ] + b->format.plane_fmt[i -1 ].size;
That's not true for multiplane buffers. We can't assume this. Is this a hardware limitation?
Quoted 69 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +69
-0+dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Contiguous-mp-buf:plane(%i),stride(%d),size(%d),iova(%p)" , + i, + b->format.plane_fmt[i].stride, + b->format.plane_fmt[i].size, + b->iova[i]); + total_plane_size += b->format.plane_fmt[i].size; + } + + b->usage = dev_buf->buffer_usage; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Contiguous-mp-buf(%s),v4l2-sizeimage(%d),total-plane-size(%d)\n" , + buf_name, + pix_mp->plane_fmt[0 ].sizeimage, + total_plane_size); + +return 0 ; +} + +static int fill_ipi_img_param (struct mtk_dip_pipe *dip_pipe, +struct img_image_buffer *img, +struct mtk_dip_dev_buffer *dev_buf, +char *buf_name) +{ + img->format.width = dev_buf->fmt.fmt.pix_mp.width; + img->format.height = dev_buf->fmt.fmt.pix_mp.height; + +if (dev_buf && dev_buf->dev_fmt) { + img->format.colorformat = + dev_buf->dev_fmt->fmt.img.mdp_color; + }else { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: %s's dev format not set\n" , + __func__, buf_name); +return -EINVAL ; + } + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: buf(%s) IPI: w(%d),h(%d),c(0x%x)\n" , + dip_pipe->desc->name, + buf_name, + img->format.width, + img->format.height, + img->format.colorformat); + + img->format.plane_fmt[0 ].size = + dev_buf->fmt.fmt.pix_mp.plane_fmt[0 ].sizeimage; + img->format.plane_fmt[0 ].stride = + dev_buf->fmt.fmt.pix_mp.plane_fmt[0 ].bytesperline; + img->iova[0 ] = dev_buf->isp_daddr; + img->usage = dev_buf->buffer_usage; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"size(%d), stride(%d),ycbcr(%d),iova(%p),u(%d)\n" , + img->format.plane_fmt[0 ].size, + img->format.plane_fmt[0 ].stride, + img->format.ycbcr_prof, + img->iova[0 ], + img->usage); + +return 0 ; +} + +static int fill_input_ipi_param (struct mtk_dip_pipe *dip_pipe, +struct img_input *iin, +struct mtk_dip_dev_buffer *dev_buf, +char *buf_name) +{
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 956
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+struct img_image_buffer *img = &iin->buffer; + +/* Will map the vale with V4L2 color space in the future */ + img->format.ycbcr_prof =1 ; +if (is_contig_mp_buffer (dev_buf)) +return fill_ipi_img_param_mp (dip_pipe, img, dev_buf, + buf_name); +else +return fill_ipi_img_param (dip_pipe, img, dev_buf, + buf_name);
Could we support only the multiplane case?
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+} + +static int fill_output_ipi_param (struct mtk_dip_pipe *dip_pipe, +struct img_output *iout, +struct mtk_dip_dev_buffer *dev_buf_out, +struct mtk_dip_dev_buffer *dev_buf_in, +char *buf_name) +{ +int ret;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 975
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+struct img_image_buffer *img = &iout->buffer; + + img->format.ycbcr_prof =0 ; + +if (is_contig_mp_buffer (dev_buf_out)) + ret =fill_ipi_img_param_mp (dip_pipe, img, dev_buf_out, + buf_name); +else + ret =fill_ipi_img_param (dip_pipe, img, dev_buf_out, + buf_name);
Could we support only the multiplane case?
Quoted 38 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +38
-0+ + iout->crop.left =0 ; + iout->crop.top =0 ; + iout->crop.width = dev_buf_in->fmt.fmt.pix_mp.width; + iout->crop.height = dev_buf_in->fmt.fmt.pix_mp.height; + iout->crop.left_subpix =0 ; + iout->crop.top_subpix =0 ; + iout->crop.width_subpix =0 ; + iout->crop.height_subpix =0 ; + iout->rotation = dev_buf_out->rotation; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: buf(%s) IPI-ext:c_l(%d),c_t(%d),c_w(%d),c_h(%d)\n" , + dip_pipe->desc->name, + buf_name, + iout->crop.left, + iout->crop.top, + iout->crop.width, + iout->crop.height); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"c_ls(%d),c_ts(%d),c_ws(%d),c_hs(%d),rot(%d)\n" , + iout->crop.left_subpix, + iout->crop.top_subpix, + iout->crop.width_subpix, + iout->crop.height_subpix, + iout->rotation); + +return ret; +} + +int mtk_dip_pipe_job_start (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +struct platform_device *pdev = dip_pipe->dip_dev->pdev; +int ret; +int out_img_buf_idx; +struct img_ipi_frameparam dip_param;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1023
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+struct mtk_dip_dev_buffer *dev_buf_in; +struct mtk_dip_dev_buffer *dev_buf_out; +struct mtk_dip_dev_buffer *dev_buf_tuning; + +if (!pipe_job_info) { +dev_err (&pdev->dev, +"pipe_job_info(%p) in start can't be NULL\n" , + pipe_job_info); +return -EINVAL ; + }
This should be impossible to happen.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1036
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +13
-0+ +/* We need RAW and at least MDP0 or MDP 1 buffer */ +if (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ] || + (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ] && + !pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ])){ +struct mtk_dip_dev_buffer **map = pipe_job_info->buf_map; + +dev_dbg (&pdev->dev, +"can't trigger job: raw(%p), mdp0(%p), mdp1(%p)\n" , + map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ], + map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ], + map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ]); +return -EINVAL ;
This must be validated at the time of request_validate. We can't fail at this stage anymore.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1045
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+ } + +dev_dbg (&pdev->dev, +"%s:%s: pipe-job id(%d)\n" , + __func__, dip_pipe->desc->name, + pipe_job_info->id); + +/* Fill ipi params for DIP driver */ +memset (&dip_param,0 ,sizeof (struct img_ipi_frameparam ));
sizeof(dip_param)
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +15
-0+ + dip_param.index = pipe_job_info->id; + dip_param.num_outputs = pipe_job_info->num_img_capture_bufs; + dip_param.num_inputs = pipe_job_info->num_img_output_bufs; + dip_param.type =STREAM_ISP_IC ; + +/* Tuning buffer */ + dev_buf_tuning = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_TUNING_OUT ]; +if (dev_buf_tuning) { +dev_dbg (&pdev->dev, +"Tuning buf queued: pa(%p),va(%p),iova(%p)\n" , + dev_buf_tuning->scp_daddr, + dev_buf_tuning->vaddr, + dev_buf_tuning->isp_daddr);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1070
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ dip_param.tuning_data.pa = (uint32_t )dev_buf_tuning->scp_daddr; + dip_param.tuning_data.va = (uint64_t )dev_buf_tuning->vaddr; + dip_param.tuning_data.iova = + (uint32_t )dev_buf_tuning->isp_daddr; + }else { +dev_dbg (&pdev->dev, +"Doesn't enqueued tuning buffer, by-pass\n" ); + dip_param.tuning_data.pa =0 ; + dip_param.tuning_data.va =0 ; + dip_param.tuning_data.iova =0 ;
We just called memset() on this whole struct above, so no need to explicitly set these fields to 0.
Quoted 24 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +24
-0+ } + +/* Raw-in buffer */ + dev_buf_in = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ]; +if (dev_buf_in) { +struct img_input *iin = &dip_param.inputs[0 ]; + +fill_input_ipi_param (dip_pipe, iin, dev_buf_in,"RAW" ); + } + + out_img_buf_idx =0 ; + +/* MDP 0 buffer */ + dev_buf_out = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ]; +if (dev_buf_out) { +struct img_output *iout = &dip_param.outputs[out_img_buf_idx]; + +fill_output_ipi_param (dip_pipe, iout, dev_buf_out, + dev_buf_in,"MDP0" ); + out_img_buf_idx++; + } +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1104
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+/* MDP 1 buffer */ + dev_buf_out = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ]; +if (dev_buf_out) { +struct img_output *iout = &dip_param.outputs[out_img_buf_idx]; + +fill_output_ipi_param (dip_pipe, iout, dev_buf_out, + dev_buf_in,"MDP1" ); + out_img_buf_idx++; + }
The 2 buffers above could be handled in a loop.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1107
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +3
-0+ + ret =mtk_dip_hw_enqueue (&dip_pipe->dip_dev->dip_hw, &dip_param); +
Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1116
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+if (ret) { +dev_dbg (&pdev->dev, +"%s:%s: enqueue to HW failed(%d)\n" , + __func__, dip_pipe->desc->name, ret); +return -EBUSY ; + } + +return ret; +}
This function could be just merged together with mtk_dip_hw_enqueue(). Please avoid unnecessary layering inside the driver.
Quoted 79 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +73
-0@@ -0,0 +1,321 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_DEV_H_ +#define _MTK_DIP_DEV_H_ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-subdev.h> +#include <media/v4l2-device.h> +#include <linux/videodev2.h> +#include <media/videobuf2-core.h> +#include <media/videobuf2-v4l2.h> + +#include "mtk_dip-hw.h" +#include "mtk_dip-smem.h" + +#define MTK_DIP_PIPE_ID_PREVIEW 0 +#define MTK_DIP_PIPE_ID_CAPTURE 1 +#define MTK_DIP_PIPE_ID_REPROCESS 2 +#define MTK_DIP_PIPE_ID_TOTAL_NUM 3 + +#define MTK_DIP_VIDEO_NODE_ID_RAW_OUT 0 +#define MTK_DIP_VIDEO_NODE_ID_TUNING_OUT 1 +#define MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM 2 +#define MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE 2 +#define MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE 3 +#define MTK_DIP_VIDEO_NODE_ID_CAPTURE_TOTAL_NUM 2 +#define MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM \ + (MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM + \ + MTK_DIP_VIDEO_NODE_ID_CAPTURE_TOTAL_NUM) + +#define MTK_DIP_VIDEO_NODE_ID_NO_MASTER -1 + +#define MTK_DIP_OUTPUT_MIN_WIDTH 2U +#define MTK_DIP_OUTPUT_MIN_HEIGHT 2U +#define MTK_DIP_OUTPUT_MAX_WIDTH 5376U +#define MTK_DIP_OUTPUT_MAX_HEIGHT 4032U +#define MTK_DIP_CAPTURE_MIN_WIDTH 2U +#define MTK_DIP_CAPTURE_MIN_HEIGHT 2U +#define MTK_DIP_CAPTURE_MAX_WIDTH 5376U +#define MTK_DIP_CAPTURE_MAX_HEIGHT 4032U + +#define MTK_DIP_DEV_DIP_MEDIA_MODEL_NAME "MTK-ISP-DIP-V4L2" +#define MTK_DIP_DEV_DIP_PREVIEW_NAME \ + MTK_DIP_DEV_DIP_MEDIA_MODEL_NAME +#define MTK_DIP_DEV_DIP_CAPTURE_NAME "MTK-ISP-DIP-CAP-V4L2" +#define MTK_DIP_DEV_DIP_REPROCESS_NAME "MTK-ISP-DIP-REP-V4L2" + +#define MTK_DIP_DEV_META_BUF_DEFAULT_SIZE (1110 * 1024) + +#define V4L2_CID_PRIVATE_UT_NUM (V4L2_CID_USER_BASE | 0x1001) +#define V4L2_CID_PRIVATE_SET_BUFFER_USAGE (V4L2_CID_PRIVATE_UT_NUM + 2) +#define V4L2_CID_MTK_DIP_MAX 100 + +enum mtk_dip_v4l2_buffer_usage { + MTK_DIP_V4l2_BUF_USAGE_DEFAULT =0 , + MTK_DIP_V4l2_BUF_USAGE_FD, + MTK_DIP_V4l2_BUF_USAGE_POSTPROC,
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h line 83
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +10
-0+ MTK_DIP_V4l2_BUF_USAGE_NONE, +}; + +/* +* Supported format and the information used for +* size calculation +*/ +struct mtk_dip_dev_meta_format { +u32 dataformat; +u32 max_buffer_size;
There should not be such a thing as "max buffer size" for metadata buffers. The buffer should always have a fixed size, equal to the size of the metadata struct.
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +12
-0+u8 flags; +}; + +/* MDP part private format definitation */ +struct mtk_dip_dev_mdp_format { +u32 pixelformat; +u32 mdp_color; +u32 colorspace; +u8 depth[VIDEO_MAX_PLANES ]; +u8 row_depth[VIDEO_MAX_PLANES ]; +u8 num_planes; +u8 walign;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h line 105
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +10
-0+u8 halign; +u8 salign; +u32 flags; +}; + +struct mtk_dip_dev_format { +union { +struct mtk_dip_dev_meta_format meta; +struct mtk_dip_dev_mdp_format img; + } fmt;
I don't see much value in having this as an union. Couldn't we just merge both structs and have as one mtk_dip_dev_format? meta.dataformat seems equivalent to img.pixelformat and both have flags.
Quoted 852 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +216
-0+}; + +struct mtk_dip_pipe_job_info { +struct media_request *req; +int id; +struct mtk_dip_dev_buffer * + buf_map[MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ]; +int num_img_capture_bufs; +int num_img_output_bufs; +int num_meta_capture_bufs; +int num_meta_output_bufs; +struct list_head list; +}; + +struct mtk_dip_dev_buffer { +struct vb2_v4l2_buffer vbb; +struct v4l2_format fmt; +struct mtk_dip_dev_format *dev_fmt; +int pipe_job_id; +void *vaddr; +dma_addr_t isp_daddr; +dma_addr_t scp_daddr; +unsigned int buffer_usage; +int rotation; +struct list_head list; +}; + +struct mtk_dip_pipe_desc { +char *name; +int master; +int id; +struct mtk_dip_video_device_desc *output_queue_descs; +int total_output_queues; +struct mtk_dip_video_device_desc *capture_queue_descs; +int total_capture_queues; +}; + +struct mtk_dip_video_device_desc { +int id; +char *name; +u32 buf_type; +u32 cap; +int smem_alloc; +int dynamic; +int default_enable; +struct mtk_dip_dev_format *fmts; +int num_fmts; +char *description; +int default_width; +int default_height; +const struct v4l2_ioctl_ops *ops; +int default_fmt_idx; +}; + +struct mtk_dip_dev_queue { +struct vb2_queue vbq; +/* Serializes vb2 queue and video device operations */ +struct mutex lock; +struct mtk_dip_dev_format *dev_fmt; +/* Firmware uses buffer_usage to select suitable DMA ports */ +unsigned int buffer_usage; +int rotation; +}; + +struct mtk_dip_video_device { +struct video_device vdev; +struct mtk_dip_dev_queue dev_q; +struct v4l2_format vdev_fmt; +struct media_pad vdev_pad; +struct v4l2_mbus_framefmt pad_fmt; +struct v4l2_ctrl_handler ctrl_handler; +int immutable; +int enabled; +struct mtk_dip_video_device_desc *desc; +atomic_t sequence; +}; + +struct mtk_dip_pipe { +struct mtk_dip_dev *dip_dev; +struct mtk_dip_video_device nodes[MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ]; +int num_nodes; +int streaming; +struct media_pad *subdev_pads; +struct media_pipeline pipeline; +struct v4l2_subdev subdev; +struct v4l2_subdev_fh *fh; +struct v4l2_ctrl_handler ctrl_handler; +struct mtk_dip_smem_dev *smem_alloc_dev; +atomic_t pipe_job_sequence; +struct mtk_dip_pipe_job_info pipe_job_infos[VB2_MAX_FRAME ]; +int num_pipe_job_infos; +struct list_head pipe_job_running_list; +struct list_head pipe_job_free_list; +/* Serializes pipe's stream on/off and buffers enqueue operations */ +struct mutex lock; +spinlock_t job_lock;/* protect the pipe job list */ +struct mtk_dip_pipe_desc *desc; +}; + +struct mtk_dip_dev { +struct platform_device *pdev; +struct media_device mdev; +struct v4l2_device v4l2_dev; +struct mtk_dip_pipe dip_pipe[MTK_DIP_PIPE_ID_TOTAL_NUM ]; +struct mtk_dip_smem_dev smem_alloc_dev; +struct mtk_dip_hw dip_hw; +}; + +int mtk_dip_dev_media_register (struct device *dev, +struct media_device *media_dev, +const char *model); + +int mtk_dip_dev_v4l2_init (struct mtk_dip_dev *dip_dev); + +void mtk_dip_dev_v4l2_release (struct mtk_dip_dev *dip_dev); + +int mtk_dip_dev_v4l2_register (struct device *dev, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev); + +int mtk_dip_pipe_v4l2_register (struct mtk_dip_pipe *dip_pipe, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev); + +int mtk_dip_pipe_v4l2_unregister (struct mtk_dip_pipe *dip_pipe); + +void mtk_dip_v4l2_buffer_done (struct vb2_buffer *vb, +enum vb2_buffer_state state); + +int mtk_dip_pipe_queue_buffers (struct media_request *req,int initial); + +int mtk_dip_pipe_init (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_dev *dip_dev, +struct mtk_dip_pipe_desc *setting, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev, +struct mtk_dip_smem_dev *smem_alloc_dev); + +int mtk_dip_pipe_release (struct mtk_dip_pipe *dip_pipe); + +int mtk_dip_pipe_job_finish (struct mtk_dip_pipe *dip_pipe, +unsigned int pipe_job_info_id, +enum vb2_buffer_state state); + +int mtk_dip_pipe_job_start (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info); + +int mtk_dip_pipe_init_job_infos (struct mtk_dip_pipe *dip_pipe); + +struct mtk_dip_dev_format * +mtk_dip_pipe_find_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +u32 format); + +int mtk_dip_pipe_set_img_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_pix_format_mplane *user_fmt, +struct v4l2_pix_format_mplane *node_fmt); + +int mtk_dip_pipe_set_meta_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_meta_format *user_fmt, +struct v4l2_meta_format *node_fmt); + +void mtk_dip_pipe_load_default_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_format *fmt_to_fill); + +int mtk_dip_pipe_streamon (struct mtk_dip_pipe *dip_pipe); + +int mtk_dip_pipe_streamoff (struct mtk_dip_pipe *dip_pipe); + +int mtk_dip_ctrl_init (struct mtk_dip_pipe *dip_pipe); + +static inline struct mtk_dip_video_device * +mtk_dip_file_to_node (struct file *file) +{ +return container_of (video_devdata (file), + struct mtk_dip_video_device, vdev); +} + +static inline struct mtk_dip_pipe * +mtk_dip_subdev_to_pipe (struct v4l2_subdev *sd) +{ + return container_of(sd, struct mtk_dip_pipe, subdev); +} + +static inline struct mtk_dip_video_device * +mtk_dip_vbq_to_node (struct vb2_queue *vq) +{ + return container_of(vq, struct mtk_dip_video_device, dev_q.vbq); +} + +static inline struct mtk_dip_dev_buffer * +mtk_dip_vb2_buf_to_dev_buf (struct vb2_buffer *vb) +{ + return container_of(vb, struct mtk_dip_dev_buffer, vbb.vb2_buf); +} + +static inline struct mtk_dip_dev *mtk_dip_hw_to_dev (struct mtk_dip_hw *dip_hw) +{ + return container_of(dip_hw, struct mtk_dip_dev, dip_hw); +} + +static inline int mtk_dip_buf_is_meta (u32 type) +{ +return type ==V4L2_BUF_TYPE_META_CAPTURE || + type ==V4L2_BUF_TYPE_META_OUTPUT ; +} + +static inline int mtk_dip_pipe_get_pipe_from_job_id (int pipe_job_id) +{ +return (pipe_job_id >>16 ) &0x0000FFFF ; +} + +#endif /* _MTK_DIP_DEV_H_ */ drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h new file +167
-0@@ -0,0 +1,167 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2018 MediaTek Inc. +* Author: Holmes Chiou <holmes.chiou-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_HW_H_ +#define _MTK_DIP_HW_H_ + +#include <linux/clk.h> +#include "mtk-img-ipi.h" + +enum STREAM_TYPE_ENUM { +STREAM_UNKNOWN , +STREAM_BITBLT , +STREAM_GPU_BITBLT , +STREAM_DUAL_BITBLT , +STREAM_2ND_BITBLT , +STREAM_ISP_IC , +STREAM_ISP_VR , +STREAM_ISP_ZSD , +STREAM_ISP_IP , +STREAM_ISP_VSS , +STREAM_ISP_ZSD_SLOW , +STREAM_WPE , +STREAM_WPE2 , +}; + +enum mtk_dip_hw_user_state { +DIP_STATE_INIT =0 , +DIP_STATE_STREAMON , +DIP_STATE_STREAMOFF +}; + +struct mtk_dip_hw_frame_job { +struct img_frameparam fparam; +int sequence; +}; + +struct mtk_dip_hw_user_id { +struct list_head list_entry; +u16 id; +u32 num; +u16 state; +}; + +struct mtk_dip_hw_subframe { +struct img_addr buffer; +struct sg_table table; +struct img_sw_addr config_data; +struct img_addr tuning_buf; +struct img_sw_addr frameparam; +struct list_head list_entry; +}; + +struct mtk_dip_hw_queue { +struct list_head queue; +struct mutex queuelock;/* protect queue and queue_cnt */ +u32 queue_cnt; +}; + +struct mtk_dip_hw_joblist { +struct list_head queue; +spinlock_t queuelock;/* protect job list */ +u32 queue_cnt; +}; + +struct mtk_dip_hw_thread { +struct task_struct *thread; +wait_queue_head_t wq; +}; + +struct mtk_dip_hw_work { +struct list_head list_entry; +struct img_ipi_frameparam frameparams; +struct mtk_dip_hw_user_id *user_id; +}; + +struct mtk_dip_hw_submit_work { +struct work_struct frame_work; +struct mtk_dip_hw *dip_hw; +}; + +struct mtk_dip_hw_mdpcb_work { +struct work_struct frame_work; +struct img_ipi_frameparam *frameparams; +}; + +struct mtk_dip_hw_clk { +struct clk *img_larb5; +struct clk *img_dip; +}; + +enum frame_state { +FRAME_STATE_INIT =0 , +FRAME_STATE_COMPOSING , +FRAME_STATE_RUNNING , +FRAME_STATE_DONE , +FRAME_STATE_STREAMOFF , +FRAME_STATE_ERROR , +FRAME_STATE_HW_TIMEOUT +}; + +struct mtk_dip_hw { +struct mtk_dip_hw_clk dip_clk; +struct device *larb_dev; +struct mtk_dip_hw_joblist dip_gcejoblist; +struct mtk_dip_hw_queue dip_freebufferlist; +struct mtk_dip_hw_queue dip_usedbufferlist; +struct mtk_dip_hw_thread dip_runner_thread; +struct mtk_dip_hw_queue dip_useridlist; +struct mtk_dip_hw_queue dip_worklist; +struct workqueue_struct *composer_wq; +struct mtk_dip_hw_submit_work submit_work; +wait_queue_head_t composing_wq; +wait_queue_head_t flushing_wq; +atomic_t num_composing;/* increase after ipi */ +/* increase after calling MDP driver */ +atomic_t num_running; +/*MDP/GCE callback workqueue */ +struct workqueue_struct *mdpcb_workqueue; +/* for MDP driver */ +struct platform_device *mdp_pdev; +/* for VPU driver */ +struct platform_device *vpu_pdev; +struct rproc *rproc_handle; +dma_addr_t scp_workingbuf_addr; +/* increase after enqueue */ +atomic_t dip_enque_cnt; +/* increase after Stream ON, decrease when Stream OFF */ +atomic_t dip_stream_cnt; +/* increase after open, decrease when close */ +atomic_t dip_user_cnt; +}; + +int mtk_dip_hw_enqueue (struct mtk_dip_hw *dip_hw, +struct img_ipi_frameparam *frameparams); +int mtk_dip_hw_connect (struct mtk_dip_hw *dip_hw); +int mtk_dip_hw_disconnect (struct mtk_dip_hw *dip_hw); +int mtk_dip_hw_streamon (struct mtk_dip_hw *dip_hw,u16 id); +int mtk_dip_hw_streamoff (struct mtk_dip_hw *dip_hw,u16 id); + +static inline struct mtk_dip_hw_frame_job +*mtk_dip_fparam_to_job (struct img_frameparam *fparam) +{ + return container_of(fparam, struct mtk_dip_hw_frame_job, fparam); +} + +static inline struct mtk_dip_hw_frame_job * +mtk_dip_ipi_fparam_to_job (struct img_ipi_frameparam *ipi_fparam) +{ +return container_of (ipi_fparam, + struct mtk_dip_hw_frame_job, + fparam.frameparam); +} + +#endif /* _MTK_DIP_HW_H_ */ +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c new file +322
-0@@ -0,0 +1,322 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/module.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> +#include <linux/dma-contiguous.h> +#include <linux/dma-mapping.h> +#include <linux/slab.h> +#include <linux/err.h> +#include <linux/iommu.h> +#include <asm/cacheflush.h> +#include "mtk_dip-smem.h" + +#define MTK_DIP_SMEM_DEV_NAME "MTK-DIP-SMEM" + +static struct reserved_mem *dip_reserved_smem; +static struct dma_map_ops smem_dma_ops; + +struct dma_coherent_mem { +void *virt_base; +dma_addr_t device_base; +unsigned long pfn_base; +int size; +int flags; +unsigned long *bitmap; +spinlock_t spinlock;/* protect dma_coherent_mem member */ +bool use_dev_dma_pfn_offset; +}; + +static struct dma_coherent_mem *dev_get_coherent_memory (struct device *dev) +{ +if (dev && dev->dma_mem) +return dev->dma_mem; +return NULL ; +} + +phys_addr_t mtk_dip_smem_iova_to_phys (struct mtk_dip_smem_dev *smem_dev, +dma_addr_t iova) +{ +struct iommu_domain *smem_dom; +phys_addr_t addr; +phys_addr_t limit; + +if (!smem_dev) +return 0 ; + + smem_dom =iommu_get_domain_for_dev (smem_dev->dev.parent); + +if (!smem_dom) +return 0 ; + + addr =iommu_iova_to_phys (smem_dom, iova); + + limit = smem_dev->smem_base + smem_dev->smem_size; + +if (addr < smem_dev->smem_base || addr >= limit) { +dev_err (&smem_dev->dev, +"Unexpected scp_daddr %pa (must >= %pa and <%pa)\n" , + &addr, &smem_dev->smem_base, &limit); +return 0 ; + } +dev_dbg (&smem_dev->dev,"Pa verifcation pass: %pa(>=%pa, <%pa)\n" , + &addr, &smem_dev->smem_base, &limit); +return addr; +} + +/******************************************** +* MTK DIP SMEM DMA ops * +********************************************/ +static int mtk_dip_smem_get_sgtable (struct device *dev, +struct sg_table *sgt, +void *cpu_addr, +dma_addr_t dma_addr, +size_t size,unsigned long attrs) +{ +struct mtk_dip_smem_dev *smem_dev =dev_get_drvdata (dev); +int n_pages_align; +int size_align; +int page_start; +unsigned long long offset_p; + +phys_addr_t paddr =mtk_dip_smem_iova_to_phys (smem_dev, dma_addr); + + offset_p = (unsigned long long )paddr - + (unsigned long long )smem_dev->smem_base; + +dev_dbg (dev,"%s: dma_addr(%p), cpu_addr(%p), pa(%p), size(%d)\n" , + __func__, dma_addr, cpu_addr, paddr, size); + + size_align =round_up (size,PAGE_SIZE ); + n_pages_align = size_align >>PAGE_SHIFT ; + page_start = offset_p >>PAGE_SHIFT ; + +dev_dbg (dev,"%s: page_start(%d), page pa(%p), pa(%p), aligned size(%d)\n" , + __func__, + page_start, +page_to_phys (*(smem_dev->smem_pages + page_start)), + paddr, + size_align + ); + +if (!smem_dev) { +dev_err (dev,"can't get sgtable from smem_dev\n" ); +return -EINVAL ; + } + +dev_dbg (dev,"%s: get sgt of the smem: %d pages\n" , __func__, + n_pages_align); + +return sg_alloc_table_from_pages (sgt, + smem_dev->smem_pages + page_start, + n_pages_align, +0 , size_align,GFP_KERNEL ); +} + +static void *mtk_dip_smem_get_cpu_addr (struct mtk_dip_smem_dev *smem_dev, +struct scatterlist *sg) +{ +struct device *dev = &smem_dev->dev; +struct dma_coherent_mem *dma_mem = +dev_get_coherent_memory (dev); + +phys_addr_t addr = (phys_addr_t )sg_phys (sg); + +if (addr < smem_dev->smem_base || + addr > smem_dev->smem_base + smem_dev->smem_size) { +dev_err (dev,"%s: Invalid paddr %p from sg\n" , __func__, addr); +return NULL ; + } + +return dma_mem->virt_base + (addr - smem_dev->smem_base); +} + +static void mtk_dip_smem_sync_sg_for_cpu (struct device *dev, +struct scatterlist *sgl, +int nelems, +enum dma_data_direction dir) +{ +struct mtk_dip_smem_dev *smem_dev = +dev_get_drvdata (dev); +void *cpu_addr; + + cpu_addr =mtk_dip_smem_get_cpu_addr (smem_dev, sgl); + +dev_dbg (dev,"%s: paddr(%p),vaddr(%p),size(%d)\n" , + __func__,sg_phys (sgl), cpu_addr, sgl->length); + +if (cpu_addr) +__dma_unmap_area (cpu_addr, sgl->length, dir); +} + +static void mtk_dip_smem_sync_sg_for_device (struct device *dev, +struct scatterlist *sgl, +int nelems, +enum dma_data_direction dir) +{ +struct mtk_dip_smem_dev *smem_dev = +dev_get_drvdata (dev); +void *cpu_addr; + + cpu_addr =mtk_dip_smem_get_cpu_addr (smem_dev, sgl); + +dev_dbg (dev,"%s: pa(%p),va(%p),size(%d),dir(%d)\n" , + __func__,sg_phys (sgl), cpu_addr, sgl->length, dir); + +if (cpu_addr) +__dma_map_area (cpu_addr, sgl->length, dir); +} + +static int mtk_dip_smem_setup_dma_ops (struct device *dev, +struct device *default_alloc_dev) +{ +memcpy ((void *)&smem_dma_ops, default_alloc_dev->dma_ops, +sizeof (smem_dma_ops)); + + smem_dma_ops.get_sgtable = + mtk_dip_smem_get_sgtable; + smem_dma_ops.sync_sg_for_device = + mtk_dip_smem_sync_sg_for_device; + smem_dma_ops.sync_sg_for_cpu = + mtk_dip_smem_sync_sg_for_cpu; + + dev->dma_ops = &smem_dma_ops; + +dev_dbg (dev,"setup smem_dma_ops: %p\n" , dev->dma_ops); + +return 0 ; +} + +void mtk_dip_smem_alloc_dev_release (struct mtk_dip_smem_dev *smem_dev) +{ +device_unregister (&smem_dev->dev); +} + +int mtk_dip_smem_alloc_dev_init (struct mtk_dip_smem_dev *smem_dev, +struct device *parent) +{ +int ret; +struct device *dev = &smem_dev->dev; + + dev->parent = parent; +dev_set_name (&smem_dev->dev,"dip-smem" ); + + ret =device_register (dev); + +if (ret) +dev_err (parent,"Failed to register smem device\n" ); + +dev_dbg (dev,"init alloc dev(%p), parent(%p)\n" , dev, dev->parent); + +dev_set_drvdata (dev, smem_dev); + +if (dip_reserved_smem) { +dma_addr_t dma_addr; +phys_addr_t addr; +struct iommu_domain *smem_dom; +int i; +int size_align; +struct page **pages; +int n_pages; +struct sg_table *sgt = &smem_dev->sgt; + + size_align =round_down (dip_reserved_smem->size,PAGE_SIZE ); + n_pages = size_align >>PAGE_SHIFT ; + pages =kmalloc_array (n_pages,sizeof (struct page *), +GFP_KERNEL ); + +if (!pages) +return -ENOMEM ; + +for (i =0 ; i < n_pages; i++) + pages[i] =phys_to_page (dip_reserved_smem->base + + i *PAGE_SIZE ); + + ret =sg_alloc_table_from_pages (sgt, pages, n_pages,0 , + size_align,GFP_KERNEL ); + +if (ret) { +dev_err (dev,"failed to get alloca sg table\n" ); +return -ENOMEM ; + } + +dma_map_sg_attrs (parent, sgt->sgl, sgt->nents, +DMA_BIDIRECTIONAL , +DMA_ATTR_SKIP_CPU_SYNC ); + + dma_addr =sg_dma_address (sgt->sgl); + smem_dom =iommu_get_domain_for_dev (parent); + addr =iommu_iova_to_phys (smem_dom, dma_addr); + +if (addr != dip_reserved_smem->base) +dev_warn (dev, +"incorrect pa(%p) from iommu_iova_to_phys, should be %p\n" , + addr, dip_reserved_smem->base); + + ret =dma_declare_coherent_memory (dev, + dip_reserved_smem->base, + dma_addr, size_align, +DMA_MEMORY_EXCLUSIVE ); + +dev_dbg (dev,"Coherent mem base(%p,%p),size(%lx),ret(%d)\n" , + dip_reserved_smem->base, dma_addr, size_align, ret); + + smem_dev->smem_base = dip_reserved_smem->base; + smem_dev->smem_size = size_align; + smem_dev->smem_pages = pages; + smem_dev->num_smem_pages = n_pages; + smem_dev->smem_dma_base = dma_addr; + +dev_dbg (dev,"smem_dev setting (%p,%lx,%p,%d)\n" , + smem_dev->smem_base, smem_dev->smem_size, + smem_dev->smem_pages, smem_dev->num_smem_pages); + } + + ret =mtk_dip_smem_setup_dma_ops (dev, parent); + +return ret; +} + +static int __init mtk_dip_smem_dma_setup (struct reserved_mem *rmem) +{ +unsigned long node = rmem->fdt_node; + +if (of_get_flat_dt_prop (node,"reusable" ,NULL )) +return -EINVAL ; + +if (!of_get_flat_dt_prop (node,"no-map" ,NULL )) { +pr_err ("Reserved memory: regions without no-map are not yet supported\n" ); +return -EINVAL ; + } + + dip_reserved_smem = rmem; + +pr_debug ("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n" , + &rmem->base, (unsigned long )rmem->size /SZ_1M ); +return 0 ; +} + +RESERVEDMEM_OF_DECLARE (mtk_dip_smem, +"mediatek,reserve-memory-dip_smem" , + mtk_dip_smem_dma_setup); + +MODULE_AUTHOR ("Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("Mediatek Camera DIP shared memory alloc device" ); +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h new file +39
-0@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_SMEM_H_ +#define _MTK_DIP_SMEM_H_ + +#include <linux/dma-mapping.h> +#include <linux/device.h> + +struct mtk_dip_smem_dev { +struct device dev; +struct sg_table sgt; +struct page **smem_pages; +int num_smem_pages; +phys_addr_t smem_base; +dma_addr_t smem_dma_base; +int smem_size; +}; + +phys_addr_t mtk_dip_smem_iova_to_phys (struct mtk_dip_smem_dev *smem_dev, +dma_addr_t iova); +int mtk_dip_smem_alloc_dev_init (struct mtk_dip_smem_dev *smem_dev, +struct device *default_alloc_dev); +void mtk_dip_smem_alloc_dev_release (struct mtk_dip_smem_dev *smem_dev); + +#endif /*_MTK_DIP_SMEM_H_*/ +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +84
-0@@ -0,0 +1,1384 @@ +// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Holmes Chiou <holmes.chiou-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/of_device.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/kthread.h> +#include <linux/pm_runtime.h> +#include <linux/dma-iommu.h> +#include <linux/spinlock.h> +#include <linux/slab.h> +#include <linux/remoteproc.h> +#include <linux/platform_data/mtk_scp.h> +#include "mtk-mdp3-cmdq.h" +#include "mtk_dip-dev.h" +#include "mtk_dip-hw.h" + +#define DIP_DEV_NAME "camera-dip" + +#define DIP_COMPOSER_THREAD_TIMEOUT 16U +#define DIP_COMPOSING_WQ_TIMEOUT 16U +#define DIP_COMPOSING_MAX_NUM 3 +#define DIP_FLUSHING_WQ_TIMEOUT 16U +#define DIP_MAX_ERR_COUNT 188U + +#define DIP_FRM_SZ (76 * 1024) +#define DIP_SUB_FRM_SZ (16 * 1024) +#define DIP_TUNING_SZ (32 * 1024) +#define DIP_COMP_SZ (24 * 1024) +#define DIP_FRAMEPARAM_SZ (4 * 1024) + +#define DIP_TUNING_OFFSET DIP_SUB_FRM_SZ +#define DIP_COMP_OFFSET (DIP_TUNING_OFFSET + DIP_TUNING_SZ) +#define DIP_FRAMEPARAM_OFFSET (DIP_COMP_OFFSET + DIP_COMP_SZ) +#define DIP_SUB_FRM_DATA_NUM 32 +#define DIP_SCP_WORKINGBUF_OFFSET (5 * 1024 * 1024) + +static inline struct mtk_dip_hw *get_dip_device (struct device *dev) +{ +struct mtk_dip_dev *dip_dev =dev_get_drvdata (dev); + +if (dip_dev) +return &dip_dev->dip_hw; +else +return NULL ; +} + +static struct img_frameparam *dip_create_framejob (int sequence) +{ +struct mtk_dip_hw_frame_job *fjob; + + fjob =kzalloc (sizeof (*fjob),GFP_ATOMIC ); + +if (!fjob) +return NULL ; + + fjob->sequence = sequence; + +return &fjob->fparam; +} + +static void dip_free_framejob (struct img_frameparam *fparam) +{ +struct mtk_dip_hw_frame_job *fjob; + + fjob =mtk_dip_fparam_to_job (fparam); + +/* to avoid use after free issue */ + fjob->sequence =-1 ; + +kfree (fjob); +}
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 94
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ +static void dip_enable_ccf_clock (struct mtk_dip_hw *dip_hw) +{ +struct mtk_dip_dev *dip_dev; +int ret; + + dip_dev =mtk_dip_hw_to_dev (dip_hw); + ret =pm_runtime_get_sync (dip_hw->larb_dev); +if (ret <0 ) +dev_err (&dip_dev->pdev->dev,"%cannot get smi larb clock\n" );
Uhm, this is not a clock operation.
The driver must get a runtime PM reference whenever the hardware power domain needs to stay powered on. In other words, as long as the hardware needs to preserve some state (in the registers, SRAM, etc.), the runtime PM status must be active.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 105
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ + ret =clk_prepare_enable (dip_hw->dip_clk.img_larb5); +if (ret) +dev_err (&dip_dev->pdev->dev, +"cannot prepare and enable img_larb5 clock\n" ); + + ret =clk_prepare_enable (dip_hw->dip_clk.img_dip); +if (ret) +dev_err (&dip_dev->pdev->dev, +"cannot prepare and enable img_dip clock\n" ); +}
There should be no need to have this function. Instead, you could use the clk_bulk_prepare_enable() API.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 112
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0+ +static void dip_disable_ccf_clock (struct mtk_dip_hw *dip_hw) +{ +clk_disable_unprepare (dip_hw->dip_clk.img_dip); +clk_disable_unprepare (dip_hw->dip_clk.img_larb5); +pm_runtime_put_sync (dip_hw->larb_dev); +}
See above.
Quoted 27 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +27
-0+ +static int dip_send (struct platform_device *pdev,enum scp_ipi_id id, +void *buf,unsigned int len,unsigned int wait) +{ +return scp_ipi_send (pdev, id, buf, len, wait); +} + +static struct mtk_dip_pipe *get_mtk_dip_pipe (struct mtk_dip_dev *dip_dev, +unsigned int pipe_id) +{ +if (pipe_id <0 && pipe_id >=MTK_DIP_PIPE_ID_TOTAL_NUM ) +return NULL ; +return &dip_dev->dip_pipe[pipe_id]; +} + +static void call_mtk_dip_pipe_finish (struct mtk_dip_hw *dip_hw, +struct img_ipi_frameparam *iparam) +{ +struct mtk_dip_dev *dip_dev; +struct mtk_dip_pipe *dip_pipe; +enum vb2_buffer_state vbf_state; +int pipe_id; +int ret; + +if (!dip_hw) { +pr_err ("%s: can't update buffer status, dip_hw is NULL\n" , + __func__);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 149
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+return ; + } + + dip_dev =mtk_dip_hw_to_dev (dip_hw); + +if (!iparam) { +dev_dbg (&dip_dev->pdev->dev,"%s: iparam can't be NULL\n" , + __func__); +return ; + }
None of the 2 error conditions above should be possible happen.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 156
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0+ + pipe_id =mtk_dip_pipe_get_pipe_from_job_id (iparam->index); + dip_pipe =get_mtk_dip_pipe (dip_dev, pipe_id); + +if (!dip_pipe) { +dev_dbg (&dip_dev->pdev->dev, +"%s: unknown pipe id(%d)\n" , __func__, pipe_id);
Since this is a sign of some serious problem, I'd make it dev_err().
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+return ; + } + +if (iparam->state ==FRAME_STATE_ERROR )
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 170
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ vbf_state =VB2_BUF_STATE_ERROR ; + else + vbf_state =VB2_BUF_STATE_DONE ; + +dev_dbg (&dip_dev->pdev->dev, +"%s: ready to return buffers,pipe(%d),pipe_job_id(%d)\n" , + __func__, pipe_id, iparam->index); + + ret =mtk_dip_pipe_job_finish (dip_pipe, iparam->index, vbf_state); +
Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 173
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+if (ret) +dev_dbg (&dip_dev->pdev->dev,"%s: finish CB failed(%d)\n" , + __func__, ret);
I don't see why it would ever fail. It should be just made a void function.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 176
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+} + +static void mtk_dip_notify (void *data)
Why void?
Quoted 99 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +99
-0+{ +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct img_frameparam *framejob; +struct mtk_dip_hw_user_id *user_id; +struct mtk_dip_hw_subframe *buf, *tmpbuf; +struct img_ipi_frameparam *frameparam; +u32 num; +bool found = false; + + frameparam = (struct img_ipi_frameparam *)data; + dip_hw = (struct mtk_dip_hw *)frameparam->drv_data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); + framejob =container_of (frameparam, + struct img_frameparam, + frameparam); + +if (frameparam->state ==FRAME_STATE_HW_TIMEOUT ) {M + dip_send(dip_hw->vpu_pdev, SCP_IPI_DIP_FRAME, + (void *)frameparam, sizeof(*frameparam), 0); +dev_err (&dip_dev->pdev->dev,"%s: frame no(%d) HW timeout\n" , + __func__, frameparam->frame_no); + } + +mutex_lock (&dip_hw->dip_usedbufferlist.queuelock); +list_for_each_entry_safe (buf, tmpbuf, + &dip_hw->dip_usedbufferlist.queue, + list_entry) { +if (buf->buffer.pa == frameparam->subfrm_data.pa) { +list_del (&buf->list_entry); + dip_hw->dip_usedbufferlist.queue_cnt--; + found = true; +dev_dbg (&dip_dev->pdev->dev, +"%s: Found used buffer(%x)\n" , + __func__, buf->buffer.pa); +break ; + } + } +mutex_unlock (&dip_hw->dip_usedbufferlist.queuelock); + +if (!found) { +dev_err (&dip_dev->pdev->dev, +"%s: frame_no(%d), buf(%x), used buf cnt(%d)\n" , + __func__, frameparam->frame_no, + frameparam->subfrm_data.pa, + dip_hw->dip_usedbufferlist.queue_cnt); + + frameparam->state =FRAME_STATE_ERROR ; + + }else { +mutex_lock (&dip_hw->dip_freebufferlist.queuelock); +list_add_tail (&buf->list_entry, + &dip_hw->dip_freebufferlist.queue); + dip_hw->dip_freebufferlist.queue_cnt++; +mutex_unlock (&dip_hw->dip_freebufferlist.queuelock); + + frameparam->state =FRAME_STATE_DONE ; + } + +call_mtk_dip_pipe_finish (dip_hw, frameparam); + + found = false; +mutex_lock (&dip_hw->dip_useridlist.queuelock); +list_for_each_entry (user_id, + &dip_hw->dip_useridlist.queue, + list_entry) { +if (mtk_dip_pipe_get_pipe_from_job_id (frameparam->index) + == user_id->id) { + user_id->num--; +dev_dbg (&dip_dev->pdev->dev, +"%s: user_id(%x) found, cnt(%d)\n" , + __func__, user_id->id, user_id->num); + found = true; +break ; + } + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); +wake_up (&dip_hw->flushing_wq); +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) is finished\n" , + __func__, framejob->frameparam.frame_no); +dip_free_framejob (framejob); + + num =atomic_dec_return (&dip_hw->num_running); +dev_dbg (&dip_dev->pdev->dev,"%s: running cnt(%d)\n" , __func__, num); +} + +static void mdp_cb_worker (struct work_struct *work) +{ +struct mtk_dip_hw_mdpcb_work *mdpcb_work; + + mdpcb_work = container_of(work, struct mtk_dip_hw_mdpcb_work, + frame_work); +mtk_dip_notify (mdpcb_work->frameparams); +kfree (mdpcb_work); +} + +static struct img_ipi_frameparam *convert_to_fparam (struct cmdq_cb_data *data) +{
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 285
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_frame_job *fjob; +struct img_ipi_frameparam *ipi_fparam; + +if (!data) { +pr_err ("%s: cmdq_cb_data can't be NULL\n" , + __func__); +return NULL ; + }
This is impossible to happen with the way this function is called.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 289
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ +if (data->sta !=CMDQ_CB_NORMAL ) +pr_debug ("%s: got CMDQ CB(%d) without CMDQ_CB_NORMAL\n" , + __func__, data->sta);
Is this a condition that could happen normally on a system working correctly?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 293
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ +if (!data->data) { +pr_err ("%s: got NULL in cmdq_cb_data\n" , + __func__);
Use dev_err() and also make the error message more descriptive, e.g. "%s: data->data is NULL"
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 297
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+return NULL ; + } + + fjob =mtk_dip_ipi_fparam_to_job (data->data);
Hmm, if we want struct mtk_dip_hw_frame_job here, why don't we just pass it to the cmdq driver with the callback?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 302
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ +if (fjob->sequence ==-1 ) { +pr_err ("%s: Invalid cmdq_cb_data(%p)\n" , + __func__, data); + ipi_fparam =NULL ;
As far as I can see, we always get the data we explicitly gave to the cmdq driver together with the callback function, so it sounds like we shouldn't be able to get invalid data here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 305
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ }else { + ipi_fparam = &fjob->fparam.frameparam; + dip_hw = (struct mtk_dip_hw *)ipi_fparam->drv_data;
Hmm, isn't ipi_fparam a firmware ABI struct? It shouldn't contain kernel pointers.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ dip_dev =mtk_dip_hw_to_dev (dip_hw); + } + + dev_dbg(&dip_dev->pdev->dev, "%s: framejob(%p), seq(%d)\n",
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 319
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ __func__, fjob, fjob->sequence); +dev_dbg (&dip_dev->pdev->dev,"%s: idx(%d), no(%d), s(%d), n_in(%d), n_out(%d), drv(%p)\n" , + __func__, + fjob->fparam.frameparam.index, + fjob->fparam.frameparam.frame_no, + fjob->fparam.frameparam.state, + fjob->fparam.frameparam.num_inputs, + fjob->fparam.frameparam.num_outputs, + fjob->fparam.frameparam.drv_data + );
This would crash if the fjob->dequence == -1 case of the if/else above hit.
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +14
-0+ +return ipi_fparam; +} + +/* Maybe in IRQ context of cmdq */ +static void dip_mdp_cb_func (struct cmdq_cb_data data) +{ +struct img_ipi_frameparam *frameparam; +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_mdpcb_work *mdpcb_work; + + frameparam =convert_to_fparam (&data); +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 343
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+if (!frameparam) { +pr_err ("%s: return due to NULL cmdq_cb_data)" , + __func__, &data); +return ; + } + + dip_hw = (struct mtk_dip_hw *)frameparam->drv_data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); + + mdpcb_work =kzalloc (sizeof (*mdpcb_work),GFP_ATOMIC );
We shouldn't need to allocate anything here. Normally one would just look up some internal driver structure matching the completed job and the work would be embedded there.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 354
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ +if (WARN_ONCE (!mdpcb_work,"%s: frame_no(%d) is lost" , + __func__, frameparam->frame_no)) +return ; + +INIT_WORK (&mdpcb_work->frame_work, mdp_cb_worker); + mdpcb_work->frameparams = frameparam; +if (data.sta !=CMDQ_CB_NORMAL ) + mdpcb_work->frameparams->state =FRAME_STATE_HW_TIMEOUT ; + +queue_work (dip_hw->mdpcb_workqueue, &mdpcb_work->frame_work);
Looking at mdp_cb_worker() and mtk_dip_notify() called by it, after fixing the locking to use spinlocks rather than mutexes and remove some dynamic allocations pointed out in other comments, we could just run them in atomic context, without the need for this workqueue.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+} + +static void dip_vpu_handler (void *data,unsigned int len,void *priv) +{ +struct img_frameparam *framejob; +struct img_ipi_frameparam *frameparam;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 370
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +unsigned long flags; +u32 num; + +if (WARN_ONCE (!data,"%s: failed due to NULL data\n" , __func__)) +return ; + + frameparam = (struct img_ipi_frameparam *)data; + framejob =dip_create_framejob (frameparam->index);
Rather than creating this dynamically, it should be already created. The reason you have the priv argument to this function is that you can have the SCP driver give to you a pointer to some struct that you gave to it when calling scp_ipi_register(). That struct should have a list of valid VPU jobs and here you should iterate through that list and find a matching job or fail if there is no matching one. (We need to validate here, because we can't trust the values coming from the firmware.)
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 381
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ +if (WARN_ONCE (!framejob,"%s: frame_no(%d) is lost\n" , + __func__, frameparam->frame_no)) +return ; + + dip_hw = (struct mtk_dip_hw *)frameparam->drv_data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); + +wake_up (&dip_hw->composing_wq); +memcpy (&framejob->frameparam, data,sizeof (framejob->frameparam)); + num =atomic_dec_return (&dip_hw->num_composing);
The order here is wrong. If you wake up before decrementing, you may end up making the woken up thread wait again, because the value is still not decremented.
Quoted 27 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +27
-0+ +spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, flags); +list_add_tail (&framejob->list_entry, &dip_hw->dip_gcejoblist.queue); + dip_hw->dip_gcejoblist.queue_cnt++; +spin_unlock_irqrestore (&dip_hw->dip_gcejoblist.queuelock, flags); + +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) is back, composing num(%d)\n" , + __func__, frameparam->frame_no, num); + +wake_up (&dip_hw->dip_runner_thread.wq); +} + +static int dip_runner_func (void *data) +{ +struct img_frameparam *framejob; +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_user_id *user_id; +unsigned long flags; +bool found; +u32 queuecnt, num; +int ret; + + dip_hw = (struct mtk_dip_hw *)data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 418
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+while (1 ) { +spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, flags); + queuecnt = dip_hw->dip_gcejoblist.queue_cnt; +spin_unlock_irqrestore (&dip_hw->dip_gcejoblist.queuelock, + flags); + + ret =wait_event_interruptible_timeout + (dip_hw->dip_runner_thread.wq, + queuecnt ||kthread_should_stop (), +msecs_to_jiffies (DIP_COMPOSER_THREAD_TIMEOUT ));
Checking queuecnt here is also wrong. Please check my comment to another wait_event_* in this patch.
Also the interruptibility and timeout don't make sense here, because we just want to keep waiting unless something shows up or the kthread is forcefully woken up for stopping.
However, we probably want it to be freezable(), so that we don't have to bring the thread down and up on suspend/resume.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 429
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ +if (kthread_should_stop ()) +break ; + +if (ret ==0 ) { +/* Timeout */ + ret = -ETIME ; + }else if (ret == -ERESTARTSYS ) { +dev_err (&dip_dev->pdev->dev, +"%s: interrupted by a signal\n" , __func__); + }
All this will not be needed after fixing the comment above.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 431
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0+ +if (queuecnt >0 ) {
You can invert this condition and use continue to just go back to waiting again and reduce the code complexity.
Still, it shouldn't be possible to end up without a job in the queue anymore after fixing the waiting, as per the other comments above.
Quoted 33 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +33
-0+spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, + flags); + framejob =list_first_entry + (&dip_hw->dip_gcejoblist.queue, + struct img_frameparam, list_entry); + + dip_hw->dip_gcejoblist.queue_cnt--; +list_del (&framejob->list_entry); +spin_unlock_irqrestore + (&dip_hw->dip_gcejoblist.queuelock, flags); + + found = false; +mutex_lock (&dip_hw->dip_useridlist.queuelock); +list_for_each_entry (user_id, + &dip_hw->dip_useridlist.queue, + list_entry) { +int id = framejob->frameparam.index; + +if (mtk_dip_pipe_get_pipe_from_job_id (id) == + user_id->id) { + found = true; +break ; + } + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + +if (!found) { +dev_err (&dip_dev->pdev->dev, +"%s: frame_no(%d), idx(0x%x) is abnormal\n" , + __func__, + framejob->frameparam.frame_no, + framejob->frameparam.index); +/*
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 474
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+* Due to error index, DIP driver could NOT +* notify the V4L2 common driver to +* return buffer +*/ +dip_free_framejob (framejob); +continue ; + } + +mutex_lock (&dip_hw->dip_useridlist.queuelock); +if (user_id->state ==DIP_STATE_STREAMOFF ) {
I'd handle this in the streamoff function to avoid polluting the main path with handling of special stop conditions. As suggested in the other similar place, we should just remove the jobs from the list there, so in this thread we wouldn't end up with any jobs from any "users" being stopped.
Quoted 26 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +26
-0+ user_id->num--; +mutex_unlock + (&dip_hw->dip_useridlist.queuelock); + framejob->frameparam.state = +FRAME_STATE_STREAMOFF ; +call_mtk_dip_pipe_finish (dip_hw, + &framejob->frameparam); + +dev_dbg (&dip_dev->pdev->dev, +"%s: user_id(%x) streamoff, current num(%d); frame_no(%d) flushed\n" , + __func__, user_id->id, user_id->num, + framejob->frameparam.frame_no); + +dip_free_framejob (framejob); +continue ; + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + +dev_dbg (&dip_dev->pdev->dev, +"%s: MDP run frame_no(%d) and the rest joblist cnt(%d)\n" , + __func__, framejob->frameparam.frame_no, + dip_hw->dip_gcejoblist.queue_cnt); + +/* +* Call MDP/GCE API to do HW excecution +* Pass the framejob to MDP driver
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 510
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+*/ + framejob->frameparam.state =FRAME_STATE_COMPOSING ; + +mdp_cmdq_sendtask + (dip_hw->mdp_pdev, + (struct img_config *) + framejob->frameparam.config_data.va, + &framejob->frameparam,NULL , false, + dip_mdp_cb_func, + (void *)&framejob->frameparam);
These pointer casts shouldn't be needed.
Quoted 24 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +24
-0+ + num =atomic_inc_return (&dip_hw->num_running); +dev_dbg (&dip_dev->pdev->dev, +"%s,MDP running num(%d)\n" , __func__, num); + } + + }; + +return 0 ; +} + +static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); +
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 544
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work =list_first_entry (&dip_hw->dip_worklist.queue, + struct mtk_dip_hw_work, list_entry); +list_del (&dip_work->list_entry); + dip_hw->dip_worklist.queue_cnt--; + len = dip_hw->dip_worklist.queue_cnt; +mutex_unlock (&dip_hw->dip_worklist.queuelock); + +mutex_lock (&dip_hw->dip_useridlist.queuelock); +if (dip_work->user_id->state ==DIP_STATE_STREAMOFF ) {
This shouldn't be possible. If we're stopping the streaming, we should remove any dip_work of that user from the list, so we shouldn't be able to end up here.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ dip_work->user_id->num--; +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + + dip_work->frameparams.state =FRAME_STATE_STREAMOFF ; +call_mtk_dip_pipe_finish (dip_hw, &dip_work->frameparams); + + dev_dbg(&dip_dev->pdev->dev, + "%s: user_id(%x) is streamoff,num(%d),frame_no(%d),idx:0x%x\n", + __func__, dip_work->user_id->id, + dip_work->user_id->num, + dip_work->frameparams.frame_no,
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 565
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ dip_work->frameparams.index); + + goto free_work_list; + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + +while (num >=DIP_COMPOSING_MAX_NUM ) { + ret = wait_event_interruptible_timeout + (dip_hw->composing_wq, + (num < DIP_COMPOSING_MAX_NUM),
Waiting on a local variable?
Perhaps instead of a custom wait, we could use a semaphore initialized to DIP_COMPOSING_MAX_NUM?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 570
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ msecs_to_jiffies(DIP_COMPOSING_WQ_TIMEOUT)); + +if (ret == -ERESTARTSYS ) +dev_err (&dip_dev->pdev->dev, +"%s: interrupted by a signal\n" , __func__);
The interruptible variant doesn't make sense here. There is no reason why a workqueue could be interrupted.
Quoted 19 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +19
-0+else if (ret ==0 ) +dev_dbg (&dip_dev->pdev->dev, +"%s: timeout frame_no(%d),num(%d)\n" , + __func__, dip_work->frameparams.frame_no, + num); +else +dev_dbg (&dip_dev->pdev->dev, +"%s: wakeup frame_no(%d),num(%d)\n" , + __func__, dip_work->frameparams.frame_no, num); + + num =atomic_read (&dip_hw->num_composing); + }; + +mutex_lock (&dip_hw->dip_freebufferlist.queuelock); +if (list_empty (&dip_hw->dip_freebufferlist.queue)) { +mutex_unlock (&dip_hw->dip_freebufferlist.queuelock); + + dev_err(&dip_dev->pdev->dev, + "%s: frame_no(%d), idx(0x%x), no free buffer(%d)\n",
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 599
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ __func__, dip_work->frameparams.frame_no, + dip_work->frameparams.index, + dip_hw->dip_freebufferlist.queue_cnt); + +/* +* Call callback to notify V4L2 common framework +* for failure of enqueue +*/ + dip_work->frameparams.state =FRAME_STATE_ERROR ; +call_mtk_dip_pipe_finish (dip_hw, &dip_work->frameparams);
This is incorrect. Any request that went through req_validate must not fail for reasons other than an unexpected firmware/hardware failure. The driver must be able to handle arbitrary number of requests. (In practice, the limit of requests is limited by the number of VB2 buffers.)
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +12
-0+ +mutex_lock (&dip_hw->dip_useridlist.queuelock); + dip_work->user_id->num--; +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + + goto free_work_list; + } + + buf =list_first_entry (&dip_hw->dip_freebufferlist.queue, + struct mtk_dip_hw_subframe, + list_entry); +list_del (&buf->list_entry);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 621
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ dip_hw->dip_freebufferlist.queue_cnt--; +mutex_unlock (&dip_hw->dip_freebufferlist.queuelock); + +mutex_lock (&dip_hw->dip_usedbufferlist.queuelock); +list_add_tail (&buf->list_entry, &dip_hw->dip_usedbufferlist.queue); + dip_hw->dip_usedbufferlist.queue_cnt++; +mutex_unlock (&dip_hw->dip_usedbufferlist.queuelock); + +memcpy (&dip_work->frameparams.subfrm_data, + &buf->buffer,sizeof (buf->buffer));
These are typed struct members, so you can just assign them:
dip_work->frameparams.subfrm_data = buf->buffer;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 622
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1
-0+memset ((char *)buf->buffer.va,0 ,DIP_SUB_FRM_SZ );
No cast should be needed here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 624
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0+memcpy (&dip_work->frameparams.config_data, + &buf->config_data,sizeof (buf->config_data));
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 625
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1
-0+memset ((char *)buf->config_data.va,0 ,DIP_COMP_SZ );
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 633
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (dip_work->frameparams.tuning_data.pa ==0 ) { +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) has no tuning_data\n" , + __func__, dip_work->frameparams.frame_no); + +memcpy (&dip_work->frameparams.tuning_data, + &buf->tuning_buf,sizeof (buf->tuning_buf));
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 634
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1
-0+memset ((char *)buf->tuning_buf.va,0 ,DIP_TUNING_SZ );
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 640
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+/* +* When user enqueued without tuning buffer, +* it would use driver internal buffer. +* So, tuning_data.va should be 0 +*/ + dip_work->frameparams.tuning_data.va =0 ;
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 643
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ } + + dip_work->frameparams.drv_data = (u64 )dip_hw;
Passing kernel pointers to firmware?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 647
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ dip_work->frameparams.state =FRAME_STATE_COMPOSING ; + +memcpy ((void *)buf->frameparam.va, &dip_work->frameparams, +sizeof (dip_work->frameparams));
There shouldn't be a need to type cast the pointer.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 650
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ + dip_send(dip_hw->vpu_pdev, SCP_IPI_DIP_FRAME, + (void *)&dip_work->frameparams,
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 652
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0+ sizeof(dip_work->frameparams), 0); + num =atomic_inc_return (&dip_hw->num_composing);
Why the assignment? Perhaps you just want atomic_inc()?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 661
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +9
-0+ +free_work_list: + +dev_dbg (&dip_dev->pdev->dev, +"%s, free: frame_no(%d),idx(0x%x),worklist cnt(%d),composing num(%d)\n" , + __func__, dip_work->frameparams.frame_no, + dip_work->frameparams.index, len, num); + +kfree (dip_work);
We haven't allocated this object and so we shouldn't free it here. The layer that allocated it should receive it back and free. (But we probably don't need to allocate it dynamically as per my other comments.)
Also a general note - a work can be queued only once. This means that current code races when two dip_works are attempted to be queued very quickly one after another (or even at the same time from different threads).
I can think of two potential options for fixing this:
1) Loop in the work function until there is nothing to queue to the hardware anymore - but this needs tricky synchronization, because there is still short time at the end of the work function when a new dip_work could be added.
2) Change this to a kthread that just keeps running in a loop waiting for some available dip_work to show up and then sending it to the firmware. This should be simpler, as the kthread shouldn't have a chance to miss any dip_work queued.
I'm personally in favor of option 2, as it should simplify the synchronization.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+} + +static void mtk_dip_hw_set_clk (struct mtk_dip_hw *dip_hw,bool enable) +{
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 675
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); + +if (enable) { +dev_dbg (&dip_dev->pdev->dev,"CCF:prepare_enable clk\n" ); +dip_enable_ccf_clock (dip_hw); + }else { +dev_dbg (&dip_dev->pdev->dev,"CCF:disable_unprepare clk\n" ); +dip_disable_ccf_clock (dip_hw); + } +}
There is no value in having this function. Just call the enable/disable functions directly.
Quoted 31 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +31
-0+ +static int mtk_dip_hw_res_init (struct mtk_dip_hw *dip_hw) +{ +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +u32 i; +dma_addr_t scp_daddr; +u64 scp_mem_va; +int ret =0 ; + + dip_hw->mdp_pdev =mdp_get_plat_device (dip_dev->pdev); + +if (!dip_hw->mdp_pdev) { +dev_dbg (&dip_dev->pdev->dev, +"%s: failed to get MDP device\n" , + __func__); +return -EINVAL ; + } + +init_waitqueue_head (&dip_hw->dip_runner_thread.wq); + +/* All lists in DIP initialization */ +INIT_LIST_HEAD (&dip_hw->dip_gcejoblist.queue); +spin_lock_init (&dip_hw->dip_gcejoblist.queuelock); + dip_hw->dip_gcejoblist.queue_cnt =0 ; + +INIT_LIST_HEAD (&dip_hw->dip_freebufferlist.queue); +mutex_init (&dip_hw->dip_freebufferlist.queuelock); + dip_hw->dip_freebufferlist.queue_cnt =0 ; + +INIT_LIST_HEAD (&dip_hw->dip_usedbufferlist.queue); +mutex_init (&dip_hw->dip_usedbufferlist.queuelock);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 716
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ dip_hw->dip_usedbufferlist.queue_cnt =0 ; + + dip_hw->mdpcb_workqueue = +create_singlethread_workqueue ("mdp_callback" ); +if (!dip_hw->mdpcb_workqueue) { +dev_err (&dip_dev->pdev->dev, +"%s: unable to alloc mdpcb workqueue\n" , __func__); + ret = -ENOMEM ; + goto err_alloc_mdpcb_wq; + }
The related work seems to do a very simple task, so is there really a reason to have a separate workqueue for it?
Quoted 94 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +94
-0+ + dip_hw->composer_wq = +create_singlethread_workqueue ("dip_composer" ); +if (!dip_hw->composer_wq) { +dev_err (&dip_dev->pdev->dev, +"%s: unable to alloc composer workqueue\n" , __func__); + ret = -ENOMEM ; + goto err_alloc_composer_wq; + } +init_waitqueue_head (&dip_hw->composing_wq); +init_waitqueue_head (&dip_hw->flushing_wq); + + dip_hw->submit_work.dip_hw = dip_hw; +INIT_WORK (&dip_hw->submit_work.frame_work, dip_submit_worker); + +INIT_LIST_HEAD (&dip_hw->dip_worklist.queue); +mutex_init (&dip_hw->dip_worklist.queuelock); + dip_hw->dip_worklist.queue_cnt =0 ; + +INIT_LIST_HEAD (&dip_hw->dip_useridlist.queue); +mutex_init (&dip_hw->dip_useridlist.queuelock); + dip_hw->dip_useridlist.queue_cnt =0 ; + + dip_hw->dip_runner_thread.thread = +kthread_run (dip_runner_func, (void *)dip_hw,"dip_runner" ); + +if (IS_ERR (dip_hw->dip_runner_thread.thread)) { +dev_err (&dip_dev->pdev->dev,"%s: unable to alloc workqueue\n" , + __func__); + ret =PTR_ERR (dip_hw->dip_runner_thread.thread); + dip_hw->dip_runner_thread.thread =NULL ; + goto err_create_thread; + } + + scp_mem_va =scp_get_reserve_mem_virt (SCP_DIP_MEM_ID ); + scp_daddr =scp_get_reserve_mem_phys (SCP_DIP_MEM_ID ); + dip_hw->scp_workingbuf_addr = scp_daddr +DIP_SCP_WORKINGBUF_OFFSET ; +dev_dbg (&dip_dev->pdev->dev, +"%s: scp_mem_va(%p) ,pa(%p)\n" , __func__, scp_mem_va, + (u64 )scp_daddr); + +scp_ipi_register (dip_hw->vpu_pdev,SCP_IPI_DIP_FRAME , + dip_vpu_handler,NULL ); + +for (i =0 ; i <DIP_SUB_FRM_DATA_NUM ; i++) { +u32 size_align; +struct mtk_dip_hw_subframe *buf; +struct sg_table *sgt; +struct page **pages; +u32 npages, j; + + buf =kzalloc (sizeof (*buf),GFP_KERNEL ); +if (!buf) { + ret = -ENOMEM ; + goto err_create_thread; + } + +/* +* Total: 0 ~ 72 KB +* SubFrame: 0 ~ 16 KB +*/ + buf->buffer.pa = scp_daddr + i *DIP_FRM_SZ ; + buf->buffer.va = scp_mem_va + i *DIP_FRM_SZ ; + +/* Tuning: 16 ~ 48 KB */ + buf->tuning_buf.pa = buf->buffer.pa +DIP_TUNING_OFFSET ; + buf->tuning_buf.va = buf->buffer.va +DIP_TUNING_OFFSET ; + +/* Config_data: 48 ~ 72 KB */ + buf->config_data.pa = buf->buffer.pa +DIP_COMP_OFFSET ; + buf->config_data.va = buf->buffer.va +DIP_COMP_OFFSET ; + +/* Frame parameters: 72 ~ 76 KB */ + buf->frameparam.pa = buf->buffer.pa +DIP_FRAMEPARAM_OFFSET ; + buf->frameparam.va = buf->buffer.va +DIP_FRAMEPARAM_OFFSET ; + +/* get iova */ + npages = (DIP_SUB_FRM_SZ +DIP_TUNING_SZ ) >>PAGE_SHIFT ; + pages =kmalloc_array (npages, +sizeof (struct page *), +GFP_KERNEL ); +if (!pages) { +kfree (buf); + ret = -ENOMEM ; + goto err_create_thread; + } + + sgt = &buf->table; +for (j =0 ; j < npages; j++) + pages[j] = +phys_to_page (buf->buffer.pa + j *PAGE_SIZE ); + + size_align =round_up (DIP_SUB_FRM_SZ +DIP_TUNING_SZ , +PAGE_SIZE );
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 820
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ ret =sg_alloc_table_from_pages (sgt, pages, npages, +0 , size_align,GFP_KERNEL ); +if (ret <0 ) { +dev_err (&dip_dev->pdev->dev, +"%s: failed to get sgt from pages\n" , __func__); + ret = -ENOMEM ; +kfree (pages); +kfree (buf); + goto err_create_thread; + }
We're operating on a physically contiguous memory here (i.e. on a contiguous range of pages), so is there really a need to have an SG table for it?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 823
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ +dma_map_sg_attrs (&dip_dev->pdev->dev, sgt->sgl, sgt->nents, +DMA_BIDIRECTIONAL ,DMA_ATTR_SKIP_CPU_SYNC );
I guess you just want to call dma_map_single_attrs() with the kernel VA here.
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +15
-0+ buf->buffer.iova =sg_dma_address (buf->table.sgl); + buf->tuning_buf.iova = buf->buffer.iova + +DIP_TUNING_OFFSET ; + +dev_dbg (&dip_dev->pdev->dev, +"%s: buf(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->buffer.pa, buf->buffer.iova); + +dev_dbg (&dip_dev->pdev->dev, +"%s: config_data(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->config_data.pa, buf->config_data.va);Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 844
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ +dev_dbg (&dip_dev->pdev->dev, +"%s: tuning_buf(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->tuning_buf.pa, buf->tuning_buf.iova); + +dev_dbg (&dip_dev->pdev->dev, +"%s: frameparam(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->frameparam.pa, buf->frameparam.va); + + list_add_tail(&buf->list_entry,
But actually, why aren't these buffers managed by VB2?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please name the labels after the first cleanup step to be performed after the jump.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 36 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There shouldn't be anything in the worklist anymore at this point. Each "user" should be respnsible for cleaning after itself.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 25 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +25
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This isn't a very good pattern. We use a constant number of buffers, so we can just have an array in struct dip_hw that contains points to all the allocated mtk_dip_hw_subframe structs.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 47 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +47
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Spinlock would be a better candidate here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
What is this condition expected to do? num is a local variable in this function and nobody can change it asynchronously.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Do you perhaps mean something like:
static bool mtk_dip_hw_queue_empty(struct mtk_dip_hw *dip_hw,
struct mtk_dip_hw_user_id *user_id)
{
int num;
mutex_lock(&dip_hw->dip_useridlist.queuelock);
num = user_id->num;
mutex_unlock(&dip_hw->dip_useridlist.queuelock);
return !num;
}and then later in this function:
ret = wait_event*(dip_hw->flushing_wq, mtk_dip_hw_queue_empty(dip_hw, user_id), ...);
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There is no point in using the interruptible variant of wait_event if we can't just abort on an interrupt.
Given that this is only called from streamoff, we can't abort, so we should use wait_event_timeout().
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
With my comments above, it shouldn't be necessary to loop anymore.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
How is this possible?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is this really correctly synchronized? If we have 2 users calling this functions at the same time, one would return early assuming that the hardware is "connected" already, but the other one would be still "connecting", which could actually fail.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 48 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +48
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Sending kernel pointers to remote processor?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is the call above synchronous? If not, don't we need to wait here for SCP to initialize?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Clock should be gated dynamically by the driver when there is no more work to be done and ungated when some new work is queued.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This function always returns 0, so it can be just void.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We shouldn't need to allocate anything here. This "user_id" has a 1:1 mapping with the subdevice, so we should just store any related data directly in the structure with subdevice data.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is this really a queue? We just put pipes (subdevs) there in streamon order and they stay there in the same order all the time. It just sounds like a plain list, not a queue.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 32 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +32
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Similar comment as below. We shouldn't need any look-up like this.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
One normally uses spinlocks for list operations. (I've explained the rule of a thumb in one of my other comments for this or other patch for this or another MTK ISP driver, please check it for details.)
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is this counter actually useful? Isn't it redundant with dip_hw->dip_stream_cnt?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
It's a local variable, nobody will reference it anymore after this function returns, so no need to reset it to NULL.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 51 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +51
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This smells like some unnecessary abstraction. The relation between mtk_dip_pipe and mtk_dip_hw_user_id seems to be 1:1, so we should just merge both structs and have this function take a pointer to the former. Then we wouldn't need any iteration or error handling here.
We probably also should have this function fill in the hardware job id in the img_ipi_frameparam struct rather than the caller.
By the way, I can't find where img_ipi_frameparam is defined. Is this a struct used to communicate with the firmware?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We would not need to allocate anything here if we just have this structure already existing as a member of the mtk_media_request struct I mentioned in other comments.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
You can just assign it:
framework->frameparams = *frameparams;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
It sounds like the struct passed as the frameparams argument to this function and framework->frameparams should be two different structs.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
What if the work was already running?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The split of functions between files seems at least strange to me. The platform driver ops deal with initialization of all the media and V4L2 stuff, so I'd put them in them in the same file as all the V4L2/media ops.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 28 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +28
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I thought we already solved the larb dependency by using device links, so that drivers don't need to explicitly handle it?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Clock names should be lowercase. Also, I don't see any point in having the "DIP_CG_IMG_" prefix in the clock name
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 24 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +24
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We can just remove this message.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 21 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +21
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we need to do something to prevent the driver from scheduling next frames here and wait for the hardware to finish processing current frame here?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we need to kick off the hardware here to continue processing from the next frame?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 36 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The value behind this macro is only used here once. Please just have the string here directly.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please use the of_match_ptr() wrapper.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 71 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +58
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We shouldn't do any hardware operations just at subdev open or close. Those should happen once the streaming actually starts.
Userspace is expected to open device nodes just to query them and that shouldn't have any side effects.
In general I don't see why we actually should even do anything in subdev ops in this driver. The subdev is only exposed to bridge all the video nodes together and any control is done via either video ioctls or metadata buffers.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 26 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +26
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We probably wouldn't need this anymore after removing the custom controls.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 23 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +23
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
How is this synchronized with video node streamon/streamoff ioctls?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We need to return an error here if the field is neither ANY or NONE.
Perhaps we could do something like this:
if (v4l2_buf->field == V4L2_FIELD_ANY)
v4l2_buf->field = V4L2_FIELD_NONE;
if (v4l2_buf->field != V4L2_FIELD_NONE)
return -EINVAL;
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Do we really need to set the field in all the 3 functions here? The natural flow would be to set it in buf_out_validate for OUTPUT buffers and before calling vb2_buffer_done() for CAPTURE buffers.
Then we wouldn't even need to implement the .buf_prepare or .buf_queue callbacks.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This comment doesn't add any additional information than visible from the code itself.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This should be already clamped to [1, VB2_MAX_FRAME].
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This function shouldn't need to assign alloc_decs[] at all. You can just set vb2_queue::dev to the right struct device pointer at driver initialization and the core would use that.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I don't think this is an error. This is for handling VIDIOC_CREATE_BUFS, which can allocate for any arbitrary format.
Whether the size of the buffer is big enough for current format should be checked in .buf_prepare callback.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 26 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +26
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
How is this synchronized? What happens if another thread stops streaming of the node at the same time?
I think we could do smarter here, for example, by maintaing a counter of nodes not streaming yet.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We can't just access vb2_queue internals like this. The driver should hold any queued buffers in its own list and iterate over the list here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 19 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +19
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This should be -ENOLINK.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
A general hint: Please don't add blank lines between the assignments and then conditional blocks on the variable being assigned. Both are closely related and so shouldn't be separated.
Also, do we need to do it for every node? I think we could just move this just before the v4l2_subdev_call() below.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 47 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +47
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Something wrong with intentation here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We're probably not expecting any controls in this driver.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Do we really need a function for this simple dereference?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 31 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +31
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Name of the function is confusing, as it suggests that format is actually set. Also, that function is not very long and only called once, here. Please just move its contents here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is not a very good behavior. Ideally the driver should adjust the format to the closest supported one, not default. At least the fields that are acceptable should stay as is and just those that are unsupported should be adjusted.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 22 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +22
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
If mtk_dip_videoc_try_fmt() returns an error, we should return an error here too.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 35 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +35
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Could we have 2 predefined v4l2_framesizeenum structs and pointers to them in mtk_dip_video_device_desc structs and just copy the contents here? That would eliminate the conditional handling.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Not >=?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The second part of the condition should be already handled by the core.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The second part of the condition should be already handled by the core.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Also flags to 0.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 20 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +20
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We can just use this helper directly as the callback, without the need to implement it here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 34 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +34
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This seems to be always called with all_enable_node_need_buf == 0. Please remove the unused argument and dead code paths.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
No need for the dip_ prefix in the variables if there is no collision.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we still need to validate whether all the buffers in the request belong to the same pipe?
Also double space after return.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
If we're only interested in buffers, we can invert the condition and use the continue keyword to reduce the indentation level.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
count is not changed in this loop. How is it possible for this condition to be false?
Anyway, we can do it without a counter:
struct mtk_dip_pipe *pipe, *pipe_prev = NULL;
//...
list_for_each_entry(...) {
// ...
pipe = vb2_get_drv_priv(,,,);
if (pipe_prev && pipe != pipe_prev) {
// error
}
pipe_prev = pipe;
}drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Can we get a buffer that isn't associated to any pipe? If not, doesn't that mean that there was no buffer in the request? In such case, probably the debug message should say that there was no buffers instead.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We shouldn't need to handle the enabled status anymore, since with requests we decide what's enabled based on what buffers are in the request.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why not just have this code inside mtk_dip_vb2_request_validate()?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is problematic, because vb2_request_queue() doesn't necessarily hand the buffers over to the driver. For example, you can still queue some requests before starting streaming on the queues and then vb2_request_queue() would keep those buffers owned by the vb2 framework until streaming is started.
I'd suggest a following redesign:
- do any driver-specific job data preparation in mtk_dip_vb2_request_validate() and store it inside the mtk_dip_request struct (superclass of struct media_request that I mentioned in another comment),
- have a driver-internal queue of requests,
- have a counter field in mtk_dip_request that would track the number of remaining buffers that still need to be handed over to the driver by the vb2,
- in .buf_queue() dereference the request attached to the buffer and decrement the above counter,
- have a function like mtk_dip_pipe_try_enqueue() that checks if the hardware is streaming and if so, tries to schedule as many requests from the top of the request queue as long as they are ready (buffer counter is 0).
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 41 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +41
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why not just have mtk_dip_node_get_v4l2_cap() include V4L2_CAP_STREAMING in the return value?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
mtk_dip_pipe_load_default_fmt() initializes this field.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Once we remove the 2 lines mentioned above, this function becomes really small and it's only used in one place, in mtk_dip_pipe_v4l2_register(). There is no need to have this in a function, just put the code directly where it's called.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Unnecessary variable initialization.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 23 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +23
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why all those debugging messages? There isn't anything special happening above, so I don't see a point in having those. Please remove.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Use dev_dbg().
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Add a blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please avoid unnecessary variable initialization.
nit: Variable declarations should be separated with a blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The two debugging messages above are not useful, please remove them.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please use dev_dbg(). Also no need for line wrapping here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 27 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +27
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I think we could just use devm_kcalloc() here and remove any matching calls to kfree(), since that would be cleaned up for us when removing the driver.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There is nothing to clean up here, we can just return directly.
A hint for avoiding this kind of mistakes: Always name the label after the first thing that needs to be cleaned up after jumping to it. In this case you wouldn't have a name for it! :)
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 35 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +35
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please group all the direct assignment to dip_pipe->subdev fields, for better code readabiltiy.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Add a blank line here.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I'd suggest moving the contents of this loop out into a separate function, which should simplify error handling and make the code more readable - shorter functions, less indentation.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Name of this function is at least confusing, because it sounds like one of the functions for getting a "superclass" pointer from a "subclass".
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Where is entity name and function set?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 59 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +59
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why not just have node->flags with all the flags already set there?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We also need to create interfaces and interface links with media_devnode_create() and media_create_intf_link() respectively.
See how the generic mem2mem code deals with it, as an example:
https://elixir.bootlin.com/linux/v5.1-rc6/source/drivers/media/v4l2-core/v4l2-mem2mem.c#L778
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 25 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +25
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Something is wrong here. This function doesn't seem to initialize the things that are being cleaned up here. It must only clean up things that set up on its own. Please fix this.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 39 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +39
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Hmm, all this function does is calling vb2_buffer_done(). Why couldn't it be called directly from wherever this function is called?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 28 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +28
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Unnecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 25 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +25
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Unneecessary blank line.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +15
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I like the blank lines separating different types of the ops here. Could you do the same for the other structs above?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 21 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +21
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
const
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 63 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +63
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
const
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Does the hardware support only BT601 for this pixel format? Note that V4L2 has color space information inside v4l2_pix_fmt_mplane, so if the hardware supports more than one, it should be exposed via that part of the format.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 43 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +43
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is it a hardware limitation that we only support formats with 1 memory planes here? (I.e. does the hardware has only 1 DMA address register or 1 register per color plane?)
Generally it's prefered to expose the M formats (e.g. NV12M) rather than the non-M ones only and ideally both.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
const
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
^ Unnecessary indentation.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 33 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +33
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
const
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
^ Unnecessary indentation.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 34 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +34
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
const
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
^ Unnecessary indentation.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 36 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
const
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
^ Unnecessary indentation.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 36 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Unnecessary variable initialization.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Missing error handling.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Missing error handling.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Missing error handling.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we need to clean up after the previous steps?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Unnecessary variable initialization.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why would one call this function with NULL argument?
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we need to unregister v4l2 and media, which we registered in mtk_dip_dev_v4l2_init()?
Best regards,
Tomasz
Part of the diff is not shown here. View the raw message.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
Quoted 89 lines · Tomasz Figa
Hi Frederic,
Quoted 27 lines · Frederic Chen
This patch adds the driver of Digital Image Processing (DIP) unit in Mediatek ISP system, providing image format conversion, resizing, and rotation features.
The mtk-isp directory will contain drivers for multiple IP blocks found in Mediatek ISP system. It will include ISP Pass 1 driver(CAM), sensor interface driver, DIP driver and face detection driver.
--- drivers/media/platform/mtk-isp/Makefile | 18 + .../media/platform/mtk-isp/isp_50/Makefile | 17 + .../platform/mtk-isp/isp_50/dip/Makefile | 32 + .../mtk-isp/isp_50/dip/mtk_dip-ctrl.c | 124 ++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.c | 1116 +++++++++++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-dev.h | 321 ++++ .../platform/mtk-isp/isp_50/dip/mtk_dip-hw.h | 167 ++ .../mtk-isp/isp_50/dip/mtk_dip-smem.c | 322 ++++ .../mtk-isp/isp_50/dip/mtk_dip-smem.h | 39 + .../platform/mtk-isp/isp_50/dip/mtk_dip-sys.c | 1384 +++++++++++++++++ .../mtk-isp/isp_50/dip/mtk_dip-v4l2.c | 1310 ++++++++++++++++ 11 files changed, 4850 insertions(+) create mode 100644 drivers/media/platform/mtk-isp/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/Makefile create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/MakefileQuoted 9 lines
create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c create mode 100644 drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.cThanks for the patch. Please see my comments inline.
Note that I'm reviewing from the bottom up, as it seems to be easier to follow the driver flow this way. This means that some comments higher in my reply may have more context lower in my reply. Please make sure to read all the comments first before seeking further clarification.
Quoted 42 lines
drivers/media/platform/mtk-isp/Makefile new file +18
-0@@ -0,0 +1,18 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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. +# + +obj-$(CONFIG_VIDEO_MEDIATEK_ISP_COMMON) += common/ + +obj-y += isp_50/ + +obj-$(CONFIG_VIDEO_MEDIATEK_ISP_FD_SUPPORT) += fd/drivers/media/platform/mtk-isp/isp_50/Makefile new file +12
-0@@ -0,0 +1,17 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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. +#
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/Makefile line 16
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/Makefile new file +4
-0+ +ifeq ($(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT),y) +obj-y += dip/ +endifWhy not just obj-$(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT)? Also, the "
_SUPPORT" suffix in the config option name is meaningless, please remove it.
I will use obj-$(CONFIG_VIDEO_MEDIATEK_ISP_DIP) instead in next patch.
Quoted 27 lines
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/Makefile new file +1
-0+drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +6
-0@@ -0,0 +1,32 @@ +# +# Copyright (C) 2018 MediaTek Inc. +# +# 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.drivers/media/platform/mtk-isp/isp_50/dip/Makefile line 16
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +10
-0+# +# 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. +# +$(info $(srctree)) +ccflags-y += -I$(srctree)/drivers/media/platform/mtk-mdp3 + +obj-y += mtk_dip-sys.oobj-$(CONFIG_VIDEO_MEDIATEK_ISP_DIP_SUPPORT)
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile line 23
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +7
-0+ +# To provide alloc context managing memory shared +# between CPU and ISP coprocessor +mtk_dip_smem-objs := \ +mtk_dip-smem.o + +obj-y += mtk_dip_smem.oDitto.
I got it.
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile line 32
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/Makefile new file +9
-0+ +# Utilits to provide frame-based streaming model +# with v4l2 user interfaces +mtk_dip_util-objs := \ +mtk_dip-dev.o \ +mtk_dip-v4l2.o \ +mtk_dip-ctrl.o \ + +obj-y += mtk_dip_util.oDitto.
I got it.
Quoted 86 lines
Quoted 73 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +67
-0@@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/device.h> +#include <linux/platform_device.h> +#include "mtk_dip-dev.h" + +static void handle_buf_usage_config (struct v4l2_ctrl *ctrl) +{ +struct mtk_dip_video_device *node = +container_of (ctrl->handler, + struct mtk_dip_video_device, ctrl_handler); + +if (ctrl->val < MTK_DIP_V4l2_BUF_USAGE_DEFAULT || + ctrl->val >= MTK_DIP_V4l2_BUF_USAGE_NONE) { +pr_err ("Invalid buffer usage id %d" , ctrl->val); +return ; + } + node->dev_q.buffer_usage = ctrl->val; +} + +static void handle_buf_rotate_config (struct v4l2_ctrl *ctrl) +{ +struct mtk_dip_video_device *node = +container_of (ctrl->handler, + struct mtk_dip_video_device, ctrl_handler); + +if (ctrl->val !=0 || ctrl->val !=90 || + ctrl->val !=180 || ctrl->val !=270 ) { +pr_err ("Invalid buffer rotation %d" , ctrl->val); +return ; + } + node->dev_q.rotation = ctrl->val; +} + +static int mtk_dip_video_device_s_ctrl (struct v4l2_ctrl *ctrl) +{ +switch (ctrl->id) { +case V4L2_CID_PRIVATE_SET_BUFFER_USAGE : +handle_buf_usage_config (ctrl); +break ; +case V4L2_CID_ROTATE : +handle_buf_rotate_config (ctrl); +break ; +default : +break ; + } +return 0 ; +} + +static const struct v4l2_ctrl_ops mtk_dip_video_device_ctrl_ops = { + .s_ctrl = mtk_dip_video_device_s_ctrl, +}; + +static const struct v4l2_ctrl_config mtk_dip_buf_usage_config = {drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c line 77
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +10
-0+ .ops = &mtk_dip_video_device_ctrl_ops, + .id = V4L2_CID_PRIVATE_SET_BUFFER_USAGE, + .name = "MTK ISP SET BUFFER USAGE", + .type = V4L2_CTRL_TYPE_INTEGER, + .min = MTK_DIP_V4l2_BUF_USAGE_DEFAULT, + .max = MTK_DIP_V4l2_BUF_USAGE_POSTPROC, + .step = 1, + .def = MTK_DIP_V4l2_BUF_USAGE_DEFAULT, + .flags = V4L2_CTRL_FLAG_SLIDER | V4L2_CTRL_FLAG_EXECUTE_ON_WRITE, + };What is this control for?
Quoted 4 lines
It looks like it selects which DMA should a buffer go to? If so, that's not the right way to do it. Each DMA port should have its corresponding
/dev/videonode and to which video node the buffer is queued determines to which hardware DMA it goes.
Yes, it is the hint for DMA port selection in SCP firmware. I would like to remove the ctrl and determine the dma port of the the buffer according to the video node it belongs to.
Quoted 210 lines
Quoted 210 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c new file +47
-0+ +int mtk_dip_ctrl_init (struct mtk_dip_pipe *dip_pipe) +{ +struct v4l2_ctrl_handler *hdl = &dip_pipe->ctrl_handler; +struct mtk_dip_video_device *node; +int i; +int img_nodes_to_be_init[3 ] = { +MTK_DIP_VIDEO_NODE_ID_RAW_OUT , +MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE , +MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE + }; + +v4l2_ctrl_handler_init (hdl,V4L2_CID_MTK_DIP_MAX ); + +pr_debug ("%s init ctrl: %p\n" , __func__, hdl); + +if (hdl->error) { +pr_err ("Failed in v4l2_ctrl_handler_init\n" ); +return hdl->error; + } + +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) +v4l2_ctrl_handler_init (&dip_pipe->nodes[i].ctrl_handler, +V4L2_CID_MTK_DIP_MAX ); + +for (i =0 ; i <ARRAY_SIZE (img_nodes_to_be_init); i++) { + node = &dip_pipe->nodes[img_nodes_to_be_init[i]]; + +if (v4l2_ctrl_new_custom (&node->ctrl_handler, + &mtk_dip_buf_usage_config, +NULL ) ==NULL ) +dev_err (&dip_pipe->dip_dev->pdev->dev, +"Node(%s) create buf_usage_config ctrl failed:(%d)" , + node->desc->name, + node->ctrl_handler.error); + +if (v4l2_ctrl_new_std (&dip_pipe->ctrl_handler, + &mtk_dip_video_device_ctrl_ops, +V4L2_CID_ROTATE ,0 ,270 ,90 ,0 ) ==NULL ) +dev_err (&dip_pipe->dip_dev->pdev->dev, +"Node(%s) create rotate ctrl failed:(%d)" , + node->desc->name, node->ctrl_handler.error); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (mtk_dip_ctrl_init);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +156
-0@@ -0,0 +1,1116 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/module.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <media/videobuf2-dma-contig.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <media/videobuf2-dma-contig.h> +#include <linux/dma-mapping.h> +#include <media/v4l2-event.h> +#include "mtk_dip-dev.h" +#include "mtk_dip-smem.h" +#include "mtk-mdp3-regs.h" +#include "mtk-img-ipi.h" + +int mtk_dip_pipe_init (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_dev *dip_dev, +struct mtk_dip_pipe_desc *setting, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev, +struct mtk_dip_smem_dev *smem_alloc_dev) +{ +int ret, i; + + dip_pipe->dip_dev = dip_dev; + dip_pipe->desc = setting; + dip_pipe->smem_alloc_dev = smem_alloc_dev; + +atomic_set (&dip_pipe->pipe_job_sequence,0 ); +spin_lock_init (&dip_pipe->job_lock); +mutex_init (&dip_pipe->lock); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev,"init pipe(%s,%d)\n" , + dip_pipe->desc->name, + dip_pipe->desc->id); + + dip_pipe->num_nodes =MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; + +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM ; i++) { + dip_pipe->nodes[i].desc = + &dip_pipe->desc->output_queue_descs[i]; + dip_pipe->nodes[i].immutable =0 ; + dip_pipe->nodes[i].enabled = + dip_pipe->nodes[i].desc->default_enable; +atomic_set (&dip_pipe->nodes[i].sequence,0 ); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: init node(%s,%d)\n" , + dip_pipe->desc->name, + dip_pipe->nodes[i].desc->name, i); + } + +for (i =MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM ; + i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +int cap_idx = i -MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM ; + + dip_pipe->nodes[i].desc = + &dip_pipe->desc->capture_queue_descs[cap_idx]; + dip_pipe->nodes[i].immutable =0 ; + dip_pipe->nodes[i].enabled = + dip_pipe->nodes[i].desc->default_enable; +atomic_set (&dip_pipe->nodes[i].sequence,0 ); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: init node(%s,%d)\n" , + dip_pipe->desc->name, + dip_pipe->nodes[i].desc->name, i); + } + +if (dip_pipe->desc->master >=0 && + dip_pipe->desc->master <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ) { + dip_pipe->nodes[dip_pipe->desc->master].immutable =1 ; + dip_pipe->nodes[dip_pipe->desc->master].enabled =1 ; + } + + ret =mtk_dip_ctrl_init (dip_pipe); + +if (ret) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: failed(%d) to initialize ctrls\n" , + dip_pipe->desc->name, ret); + goto failed_ctrl; + } + + ret =mtk_dip_pipe_v4l2_register (dip_pipe, media_dev, v4l2_dev); + +if (ret) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: failed(%d) to create V4L2 devices\n" , + dip_pipe->desc->name, ret); + goto failed_pipe; + } + +return 0 ; + +failed_ctrl: +failed_pipe: +mutex_destroy (&dip_pipe->lock); +return ret; +} + +static int mtk_dip_pipe_next_job_id (struct mtk_dip_pipe *dip_pipe) +{ +int global_job_id = +atomic_inc_return (&dip_pipe->pipe_job_sequence); + + global_job_id = + (global_job_id &0x0000FFFF ) | + (dip_pipe->desc->id <<16 ); + +return global_job_id; +} + +int mtk_dip_pipe_init_job_infos (struct mtk_dip_pipe *dip_pipe) +{ +int i; + +spin_lock (&dip_pipe->job_lock); + + dip_pipe->num_pipe_job_infos =ARRAY_SIZE (dip_pipe->pipe_job_infos); +INIT_LIST_HEAD (&dip_pipe->pipe_job_running_list); +INIT_LIST_HEAD (&dip_pipe->pipe_job_free_list); + +for (i =0 ; i < dip_pipe->num_pipe_job_infos; i++) { +struct mtk_dip_pipe_job_info *pipe_job_info = + &dip_pipe->pipe_job_infos[i]; +list_add_tail (&pipe_job_info->list, + &dip_pipe->pipe_job_free_list); + } + +spin_unlock (&dip_pipe->job_lock); + +return 0 ; +} + +static int mtk_dip_pipe_process_pipe_job_info (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info + *pipe_job_info) +{ +spin_lock (&dip_pipe->job_lock); + +list_del (&pipe_job_info->list);
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 161
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+list_add_tail (&pipe_job_info->list, &dip_pipe->pipe_job_running_list); + +spin_unlock (&dip_pipe->job_lock); +return 0 ; +}This function is also only called once, is very small and can't fail, so I don't see any advantage over just moving its contents there.
I will remove the function and move the contents to its caller.
Quoted 65 lines
Quoted 65 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +65
-0+ +struct mtk_dip_pipe_job_info * +mtk_dip_pipe_get_running_job_info (struct mtk_dip_pipe *dip_pipe, +int pipe_job_id) +{ +struct mtk_dip_pipe_job_info *pipe_job_info =NULL ; + +spin_lock (&dip_pipe->job_lock); + +list_for_each_entry (pipe_job_info, + &dip_pipe->pipe_job_running_list, list) { +if (pipe_job_info->id == pipe_job_id) { +spin_unlock (&dip_pipe->job_lock); +return pipe_job_info; + } + } + +spin_unlock (&dip_pipe->job_lock); + +return NULL ; +} + +static int +mtk_dip_pipe_free_job_info (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +spin_lock (&dip_pipe->job_lock); + +list_del (&pipe_job_info->list); +list_add_tail (&pipe_job_info->list, &dip_pipe->pipe_job_free_list); + +spin_unlock (&dip_pipe->job_lock); + +return 0 ; +} + +static struct mtk_dip_pipe_job_info * +mtk_dip_pipe_get_free_job_info (struct mtk_dip_pipe *dip_pipe) +{ +struct mtk_dip_pipe_job_info *pipe_job_info =NULL ; + +spin_lock (&dip_pipe->job_lock); +list_for_each_entry (pipe_job_info, + &dip_pipe->pipe_job_free_list, list) { +dev_dbg (&dip_pipe->dip_dev->pdev->dev,"Found free pipe job\n" ); +spin_unlock (&dip_pipe->job_lock); +return pipe_job_info; + } +spin_unlock (&dip_pipe->job_lock); + +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: can't found free pipe job\n" , + dip_pipe->desc->name); + +return NULL ; +} + +static void +mtk_dip_pipe_update_job_info (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info, +struct mtk_dip_video_device *node, +struct mtk_dip_dev_buffer *dev_buf) +{ +if (!pipe_job_info || !dev_buf || !node) { + dev_err(&dip_pipe->dip_dev->pdev->dev,
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 231
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+"%s: update pipe-job(%p) failed, buf(%p),node(%p)\n" , + dip_pipe->desc->name, + pipe_job_info, dev_buf, node); +return ; + }This function is only called in once place and all the arguments there can't be NULL. This check is useless.
I will remove the check.
Quoted 2 lines
I'd recommend moving this function lower, closer to where it's called from.
I would like to modify the function following the comment below, and move the contents to its caller.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+ +if (pipe_job_info->buf_map[node->desc->id]) +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: buf overwrite\n" , + dip_pipe->desc->name, + node->desc->name);aThis is also impossible to happen.
I will remove the check.
Quoted 10 lines
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+ +if (node->desc->buf_type ==V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) + pipe_job_info->num_img_capture_bufs++; + +if (node->desc->buf_type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) + pipe_job_info->num_img_output_bufs++; + +if (node->desc->buf_type ==V4L2_BUF_TYPE_META_OUTPUT ) + pipe_job_info->num_meta_output_bufs++;
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 249
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +3
-0+` +if (node->desc->buf_type ==V4L2_BUF_TYPE_META_CAPTURE ) + pipe_job_info->num_meta_capture_bufs++;These two counters seem to be only used for debugging messages. I don't think there is any good use for them. We should have a generic debug message for the request queue operation, printing the request objects there. Please remove.
I will remove num_meta_output_bufs and num_img_capture_bufs and add a generic request queue debug message.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 251
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + pipe_job_info->buf_map[node->desc->id] = dev_buf;Given that with my other comments, we reduce this function to only a few lines, I'd just suggest moving this line to the place this function is currently being called from.
I will modify the function as you suggested.
Quoted 38 lines
Quoted 38 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +38
-0+ +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: added buf(%p) to pipe-job(%p)\n" , + dip_pipe->desc->name, node->desc->name, dev_buf, + pipe_job_info); +} + +static void mtk_dip_pipe_debug_job (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +int i; + +if (!dip_pipe || !pipe_job_info) +return ; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: pipe-job(%p),id(%d),req(%p)buf nums(%d,%d,%d,%d)\n" , + dip_pipe->desc->name, + pipe_job_info, + pipe_job_info->id, + pipe_job_info->req, + pipe_job_info->num_img_capture_bufs, + pipe_job_info->num_img_output_bufs, + pipe_job_info->num_meta_capture_bufs, + pipe_job_info->num_meta_output_bufs); + +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +if (pipe_job_info->buf_map[i]) +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Node(%s,%d), buf(%p)\n" , + dip_pipe->nodes[i].desc->name, i, + pipe_job_info->buf_map[i]); + } +} + +int mtk_dip_pipe_job_finish (struct mtk_dip_pipe *dip_pipe, +unsigned int pipe_job_info_id, +enum vb2_buffer_state vbf_state)
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 295
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+{ +int i; +struct mtk_dip_pipe_job_info *job_info =NULL ; +const int pipe_id = +mtk_dip_pipe_get_pipe_from_job_id (pipe_job_info_id); +u64 timestamp =0 ;Unnecessary initialization.
I would like to remove the variable since it is not used.
Quoted 17 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+ +if (!dip_pipe) +pr_err ("%s: pipe-job id(%d) release failed, dip_pipe is null\n" , + __func__, pipe_job_info_id);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 309
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ + job_info =mtk_dip_pipe_get_running_job_info (dip_pipe, + pipe_job_info_id); + +if (!job_info) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: can't find pipe-job id(%d)\n" , + __func__, dip_pipe->desc->name, pipe_id); +return -EINVAL ; + }None of the 2 conditions above should be possible to happen.
I will remove the checks.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 311
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + timestamp =ktime_get_ns ();This timestamp is unused.
This line will be removed in the next patch.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 318
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +struct mtk_dip_dev_buffer *dev_buf = job_info->buf_map[i]; + +if (!dev_buf) { +continue ; + }else {No need to put this code under else.
I got it.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 319
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +1
-0+ dev_buf->vbb.vb2_buf.timestamp =ktime_get_ns ();Did you mean to use the timestamp variable here?
I would like to remove timestamp and still usedev_buf->vbb.vb2_buf.timestamp directly.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 321
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+mtk_dip_v4l2_buffer_done (&dev_buf->vbb.vb2_buf, + vbf_state);Just call
vb2_buffer_done()directly, as pointed in another comment.
I will call vb2_buffer_done directly.
Quoted 16 lines
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +15
-0+ } + } + +mtk_dip_pipe_free_job_info (dip_pipe, job_info); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: finish pipe-job, id(%d), vb state(%d)\n" , + __func__, dip_pipe->desc->name, pipe_id, + pipe_job_info_id, vbf_state); + +return 0 ; +} + +static void mtk_dip_dev_buf_fill_info (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_dev_buffer *dev_buf)
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 342
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+{ +struct vb2_v4l2_buffer *b; +struct mtk_dip_video_device *node; +struct mtk_dip_video_device_desc *desc; + + b = &dev_buf->vbb;We can just have this together with the declaration.
I will do the modification.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 344
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ node =mtk_dip_vbq_to_node (b->vb2_buf.vb2_queue); + desc = node->desc;I don't see too much savings from having a local variable for this over just using
node->descdirectly.
I will use node->desc directly.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 349
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+ dev_buf->fmt = node->vdev_fmt; + dev_buf->dev_fmt = node->dev_q.dev_fmt; + dev_buf->isp_daddr = +vb2_dma_contig_plane_dma_addr (&b->vb2_buf,0 ); + dev_buf->vaddr =vb2_plane_vaddr (&b->vb2_buf,0 );Why do we need a virtual address? Note that depending on how the buffer was allocated, this may not be a cheap operation, e.g. it may involve creating actual CPU mapping at the point of the first call to
vb2_plane_vaddr(), which is costly.
I will remove dev_buf->vaddr and this line here. (This was used only for debugging in early development stage)
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 350
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +1
-0+ dev_buf->buffer_usage = node->dev_q.buffer_usage;There should be no
buffer_usage, but rather separate queue for each usage.
I will remove mtk_dip_dev_buffer.buffer_usage and
mtk_dip_dev_queue.buffer_usage.
May I add the dma port information (DMA port selection hint) in each video node's setting (mtk_dip_video_device_desc) so that we can retrieve the hint when we need to pass the buffer to co-processor as following:
static int fill_ipi_img_param(struct mtk_dip_pipe *dip_pipe,
struct img_image_buffer *img, struct mtk_dip_dev_buffer *dev_buf, char *buf_name)
{
struct mtk_dip_video_device *vdo_dev;
// ...vdo_dev = mtk_dip_vbq_to_node(dev_buf->vbb.vb2_buf.vb2_queue); /* image parameter will be passed to firmware*/ img->usage = vdo_dev->desc->dma_hint;
// ...
}
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 357
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ dev_buf->rotation = node->dev_q.rotation; + +if (desc->smem_alloc) { + dev_buf->scp_daddr = +mtk_dip_smem_iova_to_phys + (dip_pipe->smem_alloc_dev, + dev_buf->isp_daddr);Isn't this overly wrapped? The first argument should fit in the second line.
Do you mean the modification like this:
dev_buf->scp_daddr = mtk_dip_smem_iova_to_phys (dip_pipe->smem_alloc_dev, dev_buf->isp_daddr);
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 360
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +3
-0+ }else { + dev_buf->scp_daddr =0 ; + }Things like DMA addresses should be initialized in the .buf_init vb2 callback, which is only called once the backing memory of the buffer changes.
I will fill the DMA address in .buf_init.
Quoted 10 lines
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+ + dev_dbg(&dip_pipe->dip_dev->pdev->dev, + "%s:%s: buf type(%d), idx(%d), mem(%d), isp_daddr(%p), scp_daddr(%p)\n", + dip_pipe->desc->name, + desc->name, + b->vb2_buf.type, + b->vb2_buf.index, + b->vb2_buf.memory, + dev_buf->isp_daddr,
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 374
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+ dev_buf->scp_daddr); +} + +int mtk_dip_pipe_queue_buffers (struct media_request *req, +int initial)This seems to be always called with initial == 0. Please remove the dead argument and related code paths.
I will remove initial and the code path that initial is not 0 .
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 379
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+{ +struct media_request_object *obj; +struct mtk_dip_pipe *dip_pipe; +struct mtk_dip_pipe_job_info *pipe_job_info =NULL ; +int ret =0 ;Unnecessary initialization.
I got it.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 384
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+ +list_for_each_entry (obj, &req->objects, list) { +struct vb2_buffer *vb; + +if (vb2_request_object_is_buffer (obj)) {Please invert the condition and use the continue statement to make the code less indented.
I got it.
Quoted 20 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+struct mtk_dip_dev_buffer *buf; +struct mtk_dip_dev_buffer *dev_buf; +struct mtk_dip_video_device *node; + + vb = container_of(obj, struct vb2_buffer, req_obj); + node =mtk_dip_vbq_to_node (vb->vb2_queue);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 400
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ dip_pipe =vb2_get_drv_priv (vb->vb2_queue); + dev_buf =mtk_dip_vb2_buf_to_dev_buf (vb); + buf = dev_buf; + +if (!pipe_job_info) { + pipe_job_info =mtk_dip_pipe_get_free_job_info + (dip_pipe); + +if (!pipe_job_info) + goto FAILE_JOB_NOT_TRIGGER;Labels should be lower case.
Quoted 2 lines
Generally, we already validated the request and know that there are buffers there, so we can just move this before the loop.
I will fix the label naming issue and move the check before the loop in the next patch.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 407
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ +memset (pipe_job_info->buf_map,0 , +sizeof (pipe_job_info->buf_map)); + pipe_job_info->num_img_capture_bufs =0 ; + pipe_job_info->num_img_output_bufs =0 ; + pipe_job_info->num_meta_capture_bufs =0 ; + pipe_job_info->num_meta_output_bufs =0 ;Couldn't
mtk_dip_pipe_get_free_job_info()initialize these for us?
Yes, I will initialize them in mtk_dip_pipe_get_free_job_info().
Quoted 20 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+ } + +mtk_dip_dev_buf_fill_info (dip_pipe, + buf);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 421
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ +mtk_dip_pipe_update_job_info (dip_pipe, + pipe_job_info, + node, + buf); + } + } + +if (!pipe_job_info) +return -EINVAL ;This function is called from request queue callback, so it can't return an error. If it fails here for some reason, it should return any matching buffers with error state and complete the request.
Quoted 6 lines
I'd still recommend designing this in a way that request queuing can't fail anymore. For example, we can implement our own .req_alloc in
media_device_opsand wrap the genericmedia_requeststruct into ourmtk_dip_requeststruct that would include any data that currentlymtk_dip_pipe_job_infohas. Then, we wouldn't have a way to run out of free job info structs and so no more reason to fail here.
I will re-design this part by extending media_request and implementing .req_alloc.
Quoted 10 lines
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ + pipe_job_info->id = +mtk_dip_pipe_next_job_id (dip_pipe); + +mtk_dip_pipe_debug_job (dip_pipe, pipe_job_info); + +mutex_lock (&dip_pipe->lock); + +if (!dip_pipe->streaming) { + dev_dbg(&dip_pipe->dip_dev->pdev->dev,
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 435
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +4
-0+"%s:%s: stream is off, no hw enqueue triggered\n" , + __func__, dip_pipe->desc->name); +mutex_unlock (&dip_pipe->lock); +return 0 ;We should be able to leverage vb2 for protecting us from this. I just realized this issue comes from the bad request handling in
mtk_dip_vb2_request_queue(). I added a more detailed comment there.
I will extend mtk_dip_vb2_request_validation and add mtk_dip_pipe_try_enqueue() to handle the buffer and request enqueue before stream on.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ } + +if (mtk_dip_pipe_process_pipe_job_info (dip_pipe, pipe_job_info)) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: can't start to run pipe job id(%d)\n" , + __func__, dip_pipe->desc->name, + pipe_job_info->id); +mutex_unlock (&dip_pipe->lock);a
Quoted 2 lines
Wouldn't it make sense to add a label called
err_unlockand unlock the mutex there?
Yes, I will add err_unlock and move the unlock below there.
Quoted 14 lines
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +13
-0+ goto FAILE_JOB_NOT_TRIGGER; + } + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: trigger pipe job, id(%d)\n" , + dip_pipe->desc->name, + dip_pipe->desc->id); + +if (mtk_dip_pipe_job_start (dip_pipe, pipe_job_info)) { +mutex_unlock (&dip_pipe->lock); + goto FAILE_JOB_NOT_TRIGGER; + } +
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 461
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+mutex_unlock (&dip_pipe->lock); + +return 0 ; + +FAILE_JOB_NOT_TRIGGER:Labels should be lowercase and named after the first clean up step that happens after the jump.
I got it. I will check and fix all these cases in this patch.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 466
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+if (initial) +return ret; + +mtk_dip_pipe_job_finish (dip_pipe, pipe_job_info->id, +VB2_BUF_STATE_ERROR );We jump here from above if
mtk_dip_pipe_get_free_job_info()returns NULL, so this is going to nicely crash on a NULL pointer dereference. Do we actually need to jump here from there, rather than just instantly returning an error?
No, we don't need to jump here. I will return an error instead of jumping here.
Quoted 213 lines
Quoted 196 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +195
-0+ +return -EINVAL ; +} + +int mtk_dip_pipe_release (struct mtk_dip_pipe *dip_pipe) +{ +mtk_dip_pipe_v4l2_unregister (dip_pipe); +v4l2_ctrl_handler_free (&dip_pipe->ctrl_handler); +mutex_destroy (&dip_pipe->lock); + +return 0 ; +} + +static void set_img_fmt (struct v4l2_pix_format_mplane *mfmt_to_fill, +struct mtk_dip_dev_format *dev_fmt) +{ +int i; + + mfmt_to_fill->pixelformat = dev_fmt->fmt.img.pixelformat; + mfmt_to_fill->num_planes = dev_fmt->fmt.img.num_planes; + mfmt_to_fill->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + mfmt_to_fill->quantization =V4L2_QUANTIZATION_DEFAULT ; + mfmt_to_fill->colorspace = dev_fmt->fmt.img.colorspace; + +memset (mfmt_to_fill->reserved,0 ,sizeof (mfmt_to_fill->reserved)); + +pr_debug ("%s: Fmt(%d),w(%d),h(%d),f(%d)\n" , + __func__, + mfmt_to_fill->pixelformat, + mfmt_to_fill->width, + mfmt_to_fill->height, + mfmt_to_fill->field); + +for (i =0 ; i < mfmt_to_fill->num_planes; ++i) { +int bpl = (mfmt_to_fill->width * + dev_fmt->fmt.img.row_depth[i]) /8 ; +int sizeimage = (mfmt_to_fill->width * mfmt_to_fill->height * + dev_fmt->fmt.img.depth[i]) /8 ; + + mfmt_to_fill->plane_fmt[i].bytesperline = bpl; + mfmt_to_fill->plane_fmt[i].sizeimage = sizeimage; +memset (mfmt_to_fill->plane_fmt[i].reserved, +0 ,sizeof (mfmt_to_fill->plane_fmt[i].reserved)); + +pr_debug ("plane(%d):bpl(%d),sizeimage(%u)\n" , + i, bpl, + mfmt_to_fill->plane_fmt[i].sizeimage); + } +} + +static void set_meta_fmt (struct v4l2_meta_format *metafmt_to_fill, +struct mtk_dip_dev_format *dev_fmt) +{ + metafmt_to_fill->dataformat = dev_fmt->fmt.meta.dataformat; + +if (dev_fmt->fmt.meta.max_buffer_size <=0 ) { +pr_debug ("Invalid meta buf size(%u), use default(%u)\n" , + dev_fmt->fmt.meta.max_buffer_size, +MTK_DIP_DEV_META_BUF_DEFAULT_SIZE ); + metafmt_to_fill->buffersize =MTK_DIP_DEV_META_BUF_DEFAULT_SIZE ; + }else { +pr_debug ("Use meta size(%u)\n" , + dev_fmt->fmt.meta.max_buffer_size); + metafmt_to_fill->buffersize = dev_fmt->fmt.meta.max_buffer_size; + } +} + +void mtk_dip_pipe_load_default_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_format *fmt_to_fill) +{ +struct mtk_dip_dev_format *dev_fmt; +struct mtk_dip_video_device_desc *desc = node->desc; + +if (desc->num_fmts ==0 ) { +pr_err ("%s:%s: desc->num_fmts is 0, no format support list\n" , + __func__, desc->name); +return ; + } + +if (desc->default_fmt_idx >= desc->num_fmts) { +pr_debug ("%s:%s: invalid idx(%d), must < num_fmts(%d)\n" , + __func__, desc->name, desc->default_fmt_idx, + desc->num_fmts); + desc->default_fmt_idx =0 ; + } + + dev_fmt = &desc->fmts[desc->default_fmt_idx]; + fmt_to_fill->type = desc->buf_type; +if (mtk_dip_buf_is_meta (desc->buf_type)) { +set_meta_fmt (&fmt_to_fill->fmt.meta, dev_fmt); + }else { + fmt_to_fill->fmt.pix_mp.width = desc->default_width; + fmt_to_fill->fmt.pix_mp.height = desc->default_height; + fmt_to_fill->fmt.pix_mp.field =V4L2_FIELD_NONE ; + +set_img_fmt (&fmt_to_fill->fmt.pix_mp, dev_fmt); + } +} + +struct mtk_dip_dev_format * +mtk_dip_pipe_find_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +u32 format) +{ +int i; +struct mtk_dip_dev_format *dev_fmt; + +struct mtk_dip_video_device_desc *desc = node->desc; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev,"fmt to find(%x)\n" , format); + +for (i =0 ; i < desc->num_fmts; i++) { + dev_fmt = &desc->fmts[i]; +if (!mtk_dip_buf_is_meta (desc->buf_type)) { +if (dev_fmt->fmt.img.pixelformat == format) +return dev_fmt; + }else { +if (dev_fmt->fmt.meta.dataformat == format) +return dev_fmt; + } + } + +return NULL ; +} + +int mtk_dip_pipe_set_meta_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_meta_format *user_fmt, +struct v4l2_meta_format *node_fmt) +{ +struct mtk_dip_dev_format *dev_fmt; + +if (!user_fmt || !node_fmt) +return -EINVAL ; + + dev_fmt =mtk_dip_pipe_find_fmt (dip_pipe, node, + user_fmt->dataformat); + +if (!dev_fmt) +return -EINVAL ; + + node->dev_q.dev_fmt = dev_fmt; +set_meta_fmt (node_fmt, dev_fmt); + *user_fmt = *node_fmt; + +return 0 ; +} + +int mtk_dip_pipe_set_img_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_pix_format_mplane *user_fmt, +struct v4l2_pix_format_mplane *dest_fmt) +{ +struct mtk_dip_dev_format *dev_fmt; + +if (!user_fmt || !dest_fmt) +return -EINVAL ; + + dev_fmt =mtk_dip_pipe_find_fmt (dip_pipe, node, + user_fmt->pixelformat); + +if (!dev_fmt) { +pr_debug ("%s:%s:%s: dev_fmt(%d) not found\n" , + __func__, dip_pipe->desc->name, + node->desc->name, user_fmt->pixelformat); +return -EINVAL ; + } + + node->dev_q.dev_fmt = dev_fmt; + dest_fmt->width = user_fmt->width; + dest_fmt->height = user_fmt->height; + dest_fmt->field =V4L2_FIELD_NONE ; + +set_img_fmt (dest_fmt, dev_fmt); + +return 0 ; +} + +int mtk_dip_pipe_streamon (struct mtk_dip_pipe *dip_pipe) +{ +int ret; +struct mtk_dip_dev *dip_dev; + +if (!dip_pipe) +return -EINVAL ; + + dip_dev =dev_get_drvdata (&dip_pipe->dip_dev->pdev->dev); + +mutex_lock (&dip_pipe->lock); + + ret =mtk_dip_hw_streamon (&dip_dev->dip_hw, + dip_pipe->desc->id); + +if (ret) {drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 671
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s:%s:%d: failed to start hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); +mutex_unlock (&dip_pipe->lock); +return -EBUSY ; + } + + dip_pipe->streaming =1 ; +mutex_unlock (&dip_pipe->lock);Shouldn't we also check if there isn't anything to queue to the hardware at this point? We might have been given buffers and requests before starting streaming on all the nodes. It should be relatively easy, if you follow my suggestion to redesign the request handling in another comment, i.e. you should be able to just call the
mtk_dip_pipe_try_enqueue()function here.
Quoted 2 lines
(That call could be placed in
mtk_dip_hw_streamon()as well, if we remove this function as suggested in my other comment.)
I would like to re-design this part including removing streamon abstraction and adding mtk_dip_pipe_try_enqueue() handling buffer enqueue at the point of streamon.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 679
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s:%d: start hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); + +return ret; +}Similar comments for this function as for the one below.
I got it. (and will merge it into mtk_dip_subdev_s_stream())
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 687
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ +int mtk_dip_pipe_streamoff (struct mtk_dip_pipe *dip_pipe) +{ +int ret; +struct mtk_dip_dev *dip_dev; + +if (!dip_pipe) +return -EINVAL ;How could this happen?
I will remove this line.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 689
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + dip_dev =dev_get_drvdata (&dip_pipe->dip_dev->pdev->dev);Hold on, isn't
dip_pipe->dip_devjust what we're looking for here?
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 697
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +8
-0+ +mutex_lock (&dip_pipe->lock); + + ret =mtk_dip_hw_streamoff (&dip_dev->dip_hw, + dip_pipe->desc->id); + +if (ret) { + dev_err(&dip_pipe->dip_dev->pdev->dev,We already have a direct pointer to
dip_dev, no need to go throughdip_pipeagain. Also, it sounds like simply storing a pointer to dev, rather pdev indip_devwould make more sense.
I will fix it by using dip_pipe->dip_dev.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 702
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+"%s:%s:%d: failed to stop hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); +mutex_unlock (&dip_pipe->lock); +return -EBUSY ;We must never end up in such case. If for some reason the hardware fails to stop normally, we must forcefully stop it (e.g. reset), since any memory and other resources are expected to be freed after streaming stops.
I got it. We will force streaming off and release resource in this case.
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 714
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +12
-0+ } + + dip_pipe->streaming =0 ; +mutex_unlock (&dip_pipe->lock); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s:%d: stop hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); + +return 0 ; +}The 2 functions above could be easily merged into
mtk_dip_subdev_s_stream(), which could call mtk_dip_hw_stream{off,on}() directly.
I got it and will merge them.
Quoted 159 lines
Quoted 159 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +158
-0+ +static enum mdp_ycbcr_profile +map_ycbcr_prof_mplane (struct v4l2_pix_format_mplane *pix_mp, +u32 mdp_color) +{ +if (MDP_COLOR_IS_RGB (mdp_color)) +return MDP_YCBCR_PROFILE_FULL_BT601 ; + +switch (pix_mp->colorspace) { +case V4L2_COLORSPACE_JPEG : +return MDP_YCBCR_PROFILE_JPEG ; +case V4L2_COLORSPACE_REC709 : +case V4L2_COLORSPACE_DCI_P3 : +if (pix_mp->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) +return MDP_YCBCR_PROFILE_FULL_BT709 ; +return MDP_YCBCR_PROFILE_BT709 ; +case V4L2_COLORSPACE_BT2020 : +if (pix_mp->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) +return MDP_YCBCR_PROFILE_FULL_BT2020 ; +return MDP_YCBCR_PROFILE_BT2020 ; + } +/* V4L2_COLORSPACE_SRGB or else */ +if (pix_mp->quantization ==V4L2_QUANTIZATION_FULL_RANGE ) +return MDP_YCBCR_PROFILE_FULL_BT601 ; +return MDP_YCBCR_PROFILE_BT601 ; +} + +/* Stride that is accepted by MDP HW */ +static u32 dip_mdp_fmt_get_stride (const struct mtk_dip_dev_mdp_format *fmt, +u32 bytesperline, +unsigned int plane) +{ +enum mdp_color c = fmt->mdp_color; +u32 stride; + + stride = (bytesperline *MDP_COLOR_BITS_PER_PIXEL (c)) + / fmt->row_depth[0 ]; +if (plane ==0 ) +return stride; +if (plane <MDP_COLOR_GET_PLANE_COUNT (c)) { +if (MDP_COLOR_IS_BLOCK_MODE (c)) + stride = stride /2 ; +return stride; + } +return 0 ; +} + +/* Stride that is accepted by MDP HW of format with contiguous planes */ +static u32 +dip_mdp_fmt_get_stride_contig (const struct mtk_dip_dev_mdp_format *fmt, +u32 pix_stride, +unsigned int plane) +{ +enum mdp_color c = fmt->mdp_color; +u32 stride = pix_stride; + +if (plane ==0 ) +return stride; +if (plane <MDP_COLOR_GET_PLANE_COUNT (c)) { + stride = stride >>MDP_COLOR_GET_H_SUBSAMPLE (c); +if (MDP_COLOR_IS_UV_COPLANE (c) && !MDP_COLOR_IS_BLOCK_MODE (c)) + stride = stride *2 ; +return stride; + } +return 0 ; +} + +/* Plane size that is accepted by MDP HW */ +static u32 +dip_mdp_fmt_get_plane_size (const struct mtk_dip_dev_mdp_format *fmt, +u32 stride,u32 height, +unsigned int plane) +{ +enum mdp_color c = fmt->mdp_color; +u32 bytesperline; + + bytesperline = (stride * fmt->row_depth[0 ]) + /MDP_COLOR_BITS_PER_PIXEL (c); +if (plane ==0 ) +return bytesperline * height; +if (plane <MDP_COLOR_GET_PLANE_COUNT (c)) { + height = height >>MDP_COLOR_GET_V_SUBSAMPLE (c); +if (MDP_COLOR_IS_BLOCK_MODE (c)) + bytesperline = bytesperline *2 ; +return bytesperline * height; + } +return 0 ; +} + +static int is_contig_mp_buffer (struct mtk_dip_dev_buffer *dev_buf) +{ +if (MDP_COLOR_GET_PLANE_COUNT (dev_buf->dev_fmt->fmt.img.mdp_color) + ==1 ) +return 0 ; +else +return 1 ; +} + +static int fill_ipi_img_param_mp (struct mtk_dip_pipe *dip_pipe, +struct img_image_buffer *b, +struct mtk_dip_dev_buffer *dev_buf, +char *buf_name) +{ +struct v4l2_pix_format_mplane *pix_mp; +struct mtk_dip_dev_mdp_format *mdp_fmt; +unsigned int i; +unsigned int total_plane_size =0 ; + +if (!dev_buf || !dev_buf->dev_fmt) { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: %s's dev format not set\n" , + __func__, buf_name); +return -EINVAL ; + } + + pix_mp = &dev_buf->fmt.fmt.pix_mp; + mdp_fmt = &dev_buf->dev_fmt->fmt.img; + + b->format.colorformat = dev_buf->dev_fmt->fmt.img.mdp_color; + b->format.width = dev_buf->fmt.fmt.pix_mp.width; + b->format.height = dev_buf->fmt.fmt.pix_mp.height; + b->format.ycbcr_prof = +map_ycbcr_prof_mplane (pix_mp, + dev_buf->dev_fmt->fmt.img.mdp_color); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: buf(%s), IPI: w(%d),h(%d),c(0x%x)\n" , + dip_pipe->desc->name, + buf_name, + b->format.width, + b->format.height, + b->format.colorformat); + +for (i =0 ; i < pix_mp->num_planes; ++i) { +u32 stride = +dip_mdp_fmt_get_stride + (mdp_fmt, pix_mp->plane_fmt[i].bytesperline, i); + + b->format.plane_fmt[i].stride = stride; + b->format.plane_fmt[i].size = +dip_mdp_fmt_get_plane_size (mdp_fmt, + stride, + pix_mp->height, i); + b->iova[i] = dev_buf->isp_daddr; +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Contiguous-mp-buf:plane(%i),stride(%d),size(%d),iova(%p)" , + i, + b->format.plane_fmt[i].stride, + b->format.plane_fmt[i].size, + b->iova[i]); + total_plane_size = b->format.plane_fmt[i].size; + } + +for (; i <MDP_COLOR_GET_PLANE_COUNT (b->format.colorformat); ++i) { +u32 stride = +dip_mdp_fmt_get_stride_contig + (mdp_fmt, b->format.plane_fmt[0 ].stride, i); +
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 877
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+ b->format.plane_fmt[i].stride = stride; + b->format.plane_fmt[i].size = +dip_mdp_fmt_get_plane_size (mdp_fmt, stride, + pix_mp->height, i); + b->iova[i] = b->iova[i -1 ] + b->format.plane_fmt[i -1 ].size;That's not true for multiplane buffers. We can't assume this. Is this a hardware limitation?
No, it is not a hardware limitation. I would like to add multiple non-contiguous planes support here in the next patch.
Quoted 74 lines
Quoted 74 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +73
-0+dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Contiguous-mp-buf:plane(%i),stride(%d),size(%d),iova(%p)" , + i, + b->format.plane_fmt[i].stride, + b->format.plane_fmt[i].size, + b->iova[i]); + total_plane_size += b->format.plane_fmt[i].size; + } + + b->usage = dev_buf->buffer_usage; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"Contiguous-mp-buf(%s),v4l2-sizeimage(%d),total-plane-size(%d)\n" , + buf_name, + pix_mp->plane_fmt[0 ].sizeimage, + total_plane_size); + +return 0 ; +} + +static int fill_ipi_img_param (struct mtk_dip_pipe *dip_pipe, +struct img_image_buffer *img, +struct mtk_dip_dev_buffer *dev_buf, +char *buf_name) +{ + img->format.width = dev_buf->fmt.fmt.pix_mp.width; + img->format.height = dev_buf->fmt.fmt.pix_mp.height; + +if (dev_buf && dev_buf->dev_fmt) { + img->format.colorformat = + dev_buf->dev_fmt->fmt.img.mdp_color; + }else { +dev_err (&dip_pipe->dip_dev->pdev->dev, +"%s: %s's dev format not set\n" , + __func__, buf_name); +return -EINVAL ; + } + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: buf(%s) IPI: w(%d),h(%d),c(0x%x)\n" , + dip_pipe->desc->name, + buf_name, + img->format.width, + img->format.height, + img->format.colorformat); + + img->format.plane_fmt[0 ].size = + dev_buf->fmt.fmt.pix_mp.plane_fmt[0 ].sizeimage; + img->format.plane_fmt[0 ].stride = + dev_buf->fmt.fmt.pix_mp.plane_fmt[0 ].bytesperline; + img->iova[0 ] = dev_buf->isp_daddr; + img->usage = dev_buf->buffer_usage; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"size(%d), stride(%d),ycbcr(%d),iova(%p),u(%d)\n" , + img->format.plane_fmt[0 ].size, + img->format.plane_fmt[0 ].stride, + img->format.ycbcr_prof, + img->iova[0 ], + img->usage); + +return 0 ; +} + +static int fill_input_ipi_param (struct mtk_dip_pipe *dip_pipe, +struct img_input *iin, +struct mtk_dip_dev_buffer *dev_buf, +char *buf_name) +{ +struct img_image_buffer *img = &iin->buffer; + +/* Will map the vale with V4L2 color space in the future */ + img->format.ycbcr_prof =1 ;
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 956
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+if (is_contig_mp_buffer (dev_buf)) +return fill_ipi_img_param_mp (dip_pipe, img, dev_buf, + buf_name); +else +return fill_ipi_img_param (dip_pipe, img, dev_buf, + buf_name);Could we support only the multiplane case?
I would like to add multiple non-contiguous planes support in the next patch. (No hardware limitation)
Quoted 14 lines
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +13
-0+} + +static int fill_output_ipi_param (struct mtk_dip_pipe *dip_pipe, +struct img_output *iout, +struct mtk_dip_dev_buffer *dev_buf_out, +struct mtk_dip_dev_buffer *dev_buf_in, +char *buf_name) +{ +int ret; +struct img_image_buffer *img = &iout->buffer; + + img->format.ycbcr_prof =0 ; +
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 975
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+if (is_contig_mp_buffer (dev_buf_out)) + ret =fill_ipi_img_param_mp (dip_pipe, img, dev_buf_out, + buf_name); +else + ret =fill_ipi_img_param (dip_pipe, img, dev_buf_out, + buf_name);Could we support only the multiplane case?
I would like to add multiple non-contiguous planes support in the next patch. (No hardware limitation)
Quoted 43 lines
Quoted 43 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +42
-0+ + iout->crop.left =0 ; + iout->crop.top =0 ; + iout->crop.width = dev_buf_in->fmt.fmt.pix_mp.width; + iout->crop.height = dev_buf_in->fmt.fmt.pix_mp.height; + iout->crop.left_subpix =0 ; + iout->crop.top_subpix =0 ; + iout->crop.width_subpix =0 ; + iout->crop.height_subpix =0 ; + iout->rotation = dev_buf_out->rotation; + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s: buf(%s) IPI-ext:c_l(%d),c_t(%d),c_w(%d),c_h(%d)\n" , + dip_pipe->desc->name, + buf_name, + iout->crop.left, + iout->crop.top, + iout->crop.width, + iout->crop.height); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"c_ls(%d),c_ts(%d),c_ws(%d),c_hs(%d),rot(%d)\n" , + iout->crop.left_subpix, + iout->crop.top_subpix, + iout->crop.width_subpix, + iout->crop.height_subpix, + iout->rotation); + +return ret; +} + +int mtk_dip_pipe_job_start (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +struct platform_device *pdev = dip_pipe->dip_dev->pdev; +int ret; +int out_img_buf_idx; +struct img_ipi_frameparam dip_param; +struct mtk_dip_dev_buffer *dev_buf_in; +struct mtk_dip_dev_buffer *dev_buf_out; +struct mtk_dip_dev_buffer *dev_buf_tuning; +
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1023
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+if (!pipe_job_info) { +dev_err (&pdev->dev, +"pipe_job_info(%p) in start can't be NULL\n" , + pipe_job_info); +return -EINVAL ; + }This should be impossible to happen.
I will remove the check here.
Quoted 17 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +3
-0+ +/* We need RAW and at least MDP0 or MDP 1 buffer */ + if (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT] ||drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1036
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+ (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE] && + !pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE])){ +struct mtk_dip_dev_buffer **map = pipe_job_info->buf_map; + +dev_dbg (&pdev->dev, +"can't trigger job: raw(%p), mdp0(%p), mdp1(%p)\n" , + map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ], + map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ], + map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ]); +return -EINVAL ;This must be validated at the time of
request_validate. We can't fail at this stage anymore.
I got it. I will move the check to request_validate.
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1045
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+ } + +dev_dbg (&pdev->dev, +"%s:%s: pipe-job id(%d)\n" , + __func__, dip_pipe->desc->name, + pipe_job_info->id); + +/* Fill ipi params for DIP driver */ +memset (&dip_param,0 ,sizeof (struct img_ipi_frameparam ));
sizeof(dip_param)
I will fix it.
Quoted 21 lines
Quoted 21 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +20
-0+ + dip_param.index = pipe_job_info->id; + dip_param.num_outputs = pipe_job_info->num_img_capture_bufs; + dip_param.num_inputs = pipe_job_info->num_img_output_bufs; + dip_param.type =STREAM_ISP_IC ; + +/* Tuning buffer */ + dev_buf_tuning = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_TUNING_OUT ]; +if (dev_buf_tuning) { +dev_dbg (&pdev->dev, +"Tuning buf queued: pa(%p),va(%p),iova(%p)\n" , + dev_buf_tuning->scp_daddr, + dev_buf_tuning->vaddr, + dev_buf_tuning->isp_daddr); + dip_param.tuning_data.pa = (uint32_t )dev_buf_tuning->scp_daddr; + dip_param.tuning_data.va = (uint64_t )dev_buf_tuning->vaddr; + dip_param.tuning_data.iova = + (uint32_t )dev_buf_tuning->isp_daddr; + }else {
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1070
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +5
-0+dev_dbg (&pdev->dev, +"Doesn't enqueued tuning buffer, by-pass\n" ); + dip_param.tuning_data.pa =0 ; + dip_param.tuning_data.va =0 ; + dip_param.tuning_data.iova =0 ;We just called
memset()on this whole struct above, so no need to explicitly set these fields to 0.
I will remove these unnecessary initialization here.
Quoted 29 lines
Quoted 29 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +28
-0+ } + +/* Raw-in buffer */ + dev_buf_in = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ]; +if (dev_buf_in) { +struct img_input *iin = &dip_param.inputs[0 ]; + +fill_input_ipi_param (dip_pipe, iin, dev_buf_in,"RAW" ); + } + + out_img_buf_idx =0 ; + +/* MDP 0 buffer */ + dev_buf_out = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ]; +if (dev_buf_out) { +struct img_output *iout = &dip_param.outputs[out_img_buf_idx]; + +fill_output_ipi_param (dip_pipe, iout, dev_buf_out, + dev_buf_in,"MDP0" ); + out_img_buf_idx++; + } + +/* MDP 1 buffer */ + dev_buf_out = + pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ]; +if (dev_buf_out) {
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1104
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +6
-0+struct img_output *iout = &dip_param.outputs[out_img_buf_idx]; + +fill_output_ipi_param (dip_pipe, iout, dev_buf_out, + dev_buf_in,"MDP1" ); + out_img_buf_idx++; + }The 2 buffers above could be handled in a loop.
I will use loop instead.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1107
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +3
-0+ + ret =mtk_dip_hw_enqueue (&dip_pipe->dip_dev->dip_hw, &dip_param); +Unnecessary blank line.
I got it.
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1116
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +9
-0+if (ret) { +dev_dbg (&pdev->dev, +"%s:%s: enqueue to HW failed(%d)\n" , + __func__, dip_pipe->desc->name, ret); +return -EBUSY ; + } + +return ret; +}This function could be just merged together with
mtk_dip_hw_enqueue(). Please avoid unnecessary layering inside the driver.
I will merge mtk_dip_pipe_job_start() together with mtk_dip_hw_enqueue() in the next patch.
Quoted 86 lines
Quoted 86 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +79
-0@@ -0,0 +1,321 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_DEV_H_ +#define _MTK_DIP_DEV_H_ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-subdev.h> +#include <media/v4l2-device.h> +#include <linux/videodev2.h> +#include <media/videobuf2-core.h> +#include <media/videobuf2-v4l2.h> + +#include "mtk_dip-hw.h" +#include "mtk_dip-smem.h" + +#define MTK_DIP_PIPE_ID_PREVIEW 0 +#define MTK_DIP_PIPE_ID_CAPTURE 1 +#define MTK_DIP_PIPE_ID_REPROCESS 2 +#define MTK_DIP_PIPE_ID_TOTAL_NUM 3 + +#define MTK_DIP_VIDEO_NODE_ID_RAW_OUT 0 +#define MTK_DIP_VIDEO_NODE_ID_TUNING_OUT 1 +#define MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM 2 +#define MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE 2 +#define MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE 3 +#define MTK_DIP_VIDEO_NODE_ID_CAPTURE_TOTAL_NUM 2 +#define MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM \ + (MTK_DIP_VIDEO_NODE_ID_OUT_TOTAL_NUM + \ + MTK_DIP_VIDEO_NODE_ID_CAPTURE_TOTAL_NUM) + +#define MTK_DIP_VIDEO_NODE_ID_NO_MASTER -1 + +#define MTK_DIP_OUTPUT_MIN_WIDTH 2U +#define MTK_DIP_OUTPUT_MIN_HEIGHT 2U +#define MTK_DIP_OUTPUT_MAX_WIDTH 5376U +#define MTK_DIP_OUTPUT_MAX_HEIGHT 4032U +#define MTK_DIP_CAPTURE_MIN_WIDTH 2U +#define MTK_DIP_CAPTURE_MIN_HEIGHT 2U +#define MTK_DIP_CAPTURE_MAX_WIDTH 5376U +#define MTK_DIP_CAPTURE_MAX_HEIGHT 4032U + +#define MTK_DIP_DEV_DIP_MEDIA_MODEL_NAME "MTK-ISP-DIP-V4L2" +#define MTK_DIP_DEV_DIP_PREVIEW_NAME \ + MTK_DIP_DEV_DIP_MEDIA_MODEL_NAME +#define MTK_DIP_DEV_DIP_CAPTURE_NAME "MTK-ISP-DIP-CAP-V4L2" +#define MTK_DIP_DEV_DIP_REPROCESS_NAME "MTK-ISP-DIP-REP-V4L2" + +#define MTK_DIP_DEV_META_BUF_DEFAULT_SIZE (1110 * 1024) + +#define V4L2_CID_PRIVATE_UT_NUM (V4L2_CID_USER_BASE | 0x1001) +#define V4L2_CID_PRIVATE_SET_BUFFER_USAGE (V4L2_CID_PRIVATE_UT_NUM + 2) +#define V4L2_CID_MTK_DIP_MAX 100 + +enum mtk_dip_v4l2_buffer_usage { + MTK_DIP_V4l2_BUF_USAGE_DEFAULT =0 , + MTK_DIP_V4l2_BUF_USAGE_FD, + MTK_DIP_V4l2_BUF_USAGE_POSTPROC, + MTK_DIP_V4l2_BUF_USAGE_NONE, +}; + +/* +* Supported format and the information used for +* size calculation
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h line 83
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +4
-0+*/ +struct mtk_dip_dev_meta_format { +u32 dataformat; +u32 max_buffer_size;There should not be such a thing as "max buffer size" for metadata buffers. The buffer should always have a fixed size, equal to the size of the metadata struct.
I will rename max_buffer_size as size in the merged structure below.
Quoted 19 lines
Quoted 19 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +18
-0+u8 flags; +}; + +/* MDP part private format definitation */ +struct mtk_dip_dev_mdp_format { +u32 pixelformat; +u32 mdp_color; +u32 colorspace; +u8 depth[VIDEO_MAX_PLANES ]; +u8 row_depth[VIDEO_MAX_PLANES ]; +u8 num_planes; +u8 walign; +u8 halign; +u8 salign; +u32 flags; +}; + +struct mtk_dip_dev_format {
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h line 105
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +4
-0+union { +struct mtk_dip_dev_meta_format meta; +struct mtk_dip_dev_mdp_format img; + } fmt;I don't see much value in having this as an union. Couldn't we just merge both structs and have as one
mtk_dip_dev_format? meta.dataformat seems equivalent to img.pixelformat and both have flags.
I would like to merge the structures as following:
struct mtk_dip_dev_format {
u32 pixelformat;
u32 size;
u32 mdp_color;
u32 colorspace;
u8 depth[VIDEO_MAX_PLANES];
u8 row_depth[VIDEO_MAX_PLANES];
u8 num_planes;
u8 walign;
u8 halign;
u8 salign;
u32 flags;
};Quoted 866 lines
Quoted 853 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h new file +216
-0+}; + +struct mtk_dip_pipe_job_info { +struct media_request *req; +int id; +struct mtk_dip_dev_buffer * + buf_map[MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ]; +int num_img_capture_bufs; +int num_img_output_bufs; +int num_meta_capture_bufs; +int num_meta_output_bufs; +struct list_head list; +}; + +struct mtk_dip_dev_buffer { +struct vb2_v4l2_buffer vbb; +struct v4l2_format fmt; +struct mtk_dip_dev_format *dev_fmt; +int pipe_job_id; +void *vaddr; +dma_addr_t isp_daddr; +dma_addr_t scp_daddr; +unsigned int buffer_usage; +int rotation; +struct list_head list; +}; + +struct mtk_dip_pipe_desc { +char *name; +int master; +int id; +struct mtk_dip_video_device_desc *output_queue_descs; +int total_output_queues; +struct mtk_dip_video_device_desc *capture_queue_descs; +int total_capture_queues; +}; + +struct mtk_dip_video_device_desc { +int id; +char *name; +u32 buf_type; +u32 cap; +int smem_alloc; +int dynamic; +int default_enable; +struct mtk_dip_dev_format *fmts; +int num_fmts; +char *description; +int default_width; +int default_height; +const struct v4l2_ioctl_ops *ops; +int default_fmt_idx; +}; + +struct mtk_dip_dev_queue { +struct vb2_queue vbq; +/* Serializes vb2 queue and video device operations */ +struct mutex lock; +struct mtk_dip_dev_format *dev_fmt; +/* Firmware uses buffer_usage to select suitable DMA ports */ +unsigned int buffer_usage; +int rotation; +}; + +struct mtk_dip_video_device { +struct video_device vdev; +struct mtk_dip_dev_queue dev_q; +struct v4l2_format vdev_fmt; +struct media_pad vdev_pad; +struct v4l2_mbus_framefmt pad_fmt; +struct v4l2_ctrl_handler ctrl_handler; +int immutable; +int enabled; +struct mtk_dip_video_device_desc *desc; +atomic_t sequence; +}; + +struct mtk_dip_pipe { +struct mtk_dip_dev *dip_dev; +struct mtk_dip_video_device nodes[MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ]; +int num_nodes; +int streaming; +struct media_pad *subdev_pads; +struct media_pipeline pipeline; +struct v4l2_subdev subdev; +struct v4l2_subdev_fh *fh; +struct v4l2_ctrl_handler ctrl_handler; +struct mtk_dip_smem_dev *smem_alloc_dev; +atomic_t pipe_job_sequence; +struct mtk_dip_pipe_job_info pipe_job_infos[VB2_MAX_FRAME ]; +int num_pipe_job_infos; +struct list_head pipe_job_running_list; +struct list_head pipe_job_free_list; +/* Serializes pipe's stream on/off and buffers enqueue operations */ +struct mutex lock; +spinlock_t job_lock;/* protect the pipe job list */ +struct mtk_dip_pipe_desc *desc; +}; + +struct mtk_dip_dev { +struct platform_device *pdev; +struct media_device mdev; +struct v4l2_device v4l2_dev; +struct mtk_dip_pipe dip_pipe[MTK_DIP_PIPE_ID_TOTAL_NUM ]; +struct mtk_dip_smem_dev smem_alloc_dev; +struct mtk_dip_hw dip_hw; +}; + +int mtk_dip_dev_media_register (struct device *dev, +struct media_device *media_dev, +const char *model); + +int mtk_dip_dev_v4l2_init (struct mtk_dip_dev *dip_dev); + +void mtk_dip_dev_v4l2_release (struct mtk_dip_dev *dip_dev); + +int mtk_dip_dev_v4l2_register (struct device *dev, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev); + +int mtk_dip_pipe_v4l2_register (struct mtk_dip_pipe *dip_pipe, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev); + +int mtk_dip_pipe_v4l2_unregister (struct mtk_dip_pipe *dip_pipe); + +void mtk_dip_v4l2_buffer_done (struct vb2_buffer *vb, +enum vb2_buffer_state state); + +int mtk_dip_pipe_queue_buffers (struct media_request *req,int initial); + +int mtk_dip_pipe_init (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_dev *dip_dev, +struct mtk_dip_pipe_desc *setting, +struct media_device *media_dev, +struct v4l2_device *v4l2_dev, +struct mtk_dip_smem_dev *smem_alloc_dev); + +int mtk_dip_pipe_release (struct mtk_dip_pipe *dip_pipe); + +int mtk_dip_pipe_job_finish (struct mtk_dip_pipe *dip_pipe, +unsigned int pipe_job_info_id, +enum vb2_buffer_state state); + +int mtk_dip_pipe_job_start (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info); + +int mtk_dip_pipe_init_job_infos (struct mtk_dip_pipe *dip_pipe); + +struct mtk_dip_dev_format * +mtk_dip_pipe_find_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +u32 format); + +int mtk_dip_pipe_set_img_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_pix_format_mplane *user_fmt, +struct v4l2_pix_format_mplane *node_fmt); + +int mtk_dip_pipe_set_meta_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_meta_format *user_fmt, +struct v4l2_meta_format *node_fmt); + +void mtk_dip_pipe_load_default_fmt (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_video_device *node, +struct v4l2_format *fmt_to_fill); + +int mtk_dip_pipe_streamon (struct mtk_dip_pipe *dip_pipe); + +int mtk_dip_pipe_streamoff (struct mtk_dip_pipe *dip_pipe); + +int mtk_dip_ctrl_init (struct mtk_dip_pipe *dip_pipe); + +static inline struct mtk_dip_video_device * +mtk_dip_file_to_node (struct file *file) +{ +return container_of (video_devdata (file), + struct mtk_dip_video_device, vdev); +} + +static inline struct mtk_dip_pipe * +mtk_dip_subdev_to_pipe (struct v4l2_subdev *sd) +{ + return container_of(sd, struct mtk_dip_pipe, subdev); +} + +static inline struct mtk_dip_video_device * +mtk_dip_vbq_to_node (struct vb2_queue *vq) +{ + return container_of(vq, struct mtk_dip_video_device, dev_q.vbq); +} + +static inline struct mtk_dip_dev_buffer * +mtk_dip_vb2_buf_to_dev_buf (struct vb2_buffer *vb) +{ + return container_of(vb, struct mtk_dip_dev_buffer, vbb.vb2_buf); +} + +static inline struct mtk_dip_dev *mtk_dip_hw_to_dev (struct mtk_dip_hw *dip_hw) +{ + return container_of(dip_hw, struct mtk_dip_dev, dip_hw); +} + +static inline int mtk_dip_buf_is_meta (u32 type) +{ +return type ==V4L2_BUF_TYPE_META_CAPTURE || + type ==V4L2_BUF_TYPE_META_OUTPUT ; +} + +static inline int mtk_dip_pipe_get_pipe_from_job_id (int pipe_job_id) +{ +return (pipe_job_id >>16 ) &0x0000FFFF ; +} + +#endif /* _MTK_DIP_DEV_H_ */ drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-hw.h new file +167
-0@@ -0,0 +1,167 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2018 MediaTek Inc. +* Author: Holmes Chiou <holmes.chiou-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_HW_H_ +#define _MTK_DIP_HW_H_ + +#include <linux/clk.h> +#include "mtk-img-ipi.h" + +enum STREAM_TYPE_ENUM { +STREAM_UNKNOWN , +STREAM_BITBLT , +STREAM_GPU_BITBLT , +STREAM_DUAL_BITBLT , +STREAM_2ND_BITBLT , +STREAM_ISP_IC , +STREAM_ISP_VR , +STREAM_ISP_ZSD , +STREAM_ISP_IP , +STREAM_ISP_VSS , +STREAM_ISP_ZSD_SLOW , +STREAM_WPE , +STREAM_WPE2 , +}; + +enum mtk_dip_hw_user_state { +DIP_STATE_INIT =0 , +DIP_STATE_STREAMON , +DIP_STATE_STREAMOFF +}; + +struct mtk_dip_hw_frame_job { +struct img_frameparam fparam; +int sequence; +}; + +struct mtk_dip_hw_user_id { +struct list_head list_entry; +u16 id; +u32 num; +u16 state; +}; + +struct mtk_dip_hw_subframe { +struct img_addr buffer; +struct sg_table table; +struct img_sw_addr config_data; +struct img_addr tuning_buf; +struct img_sw_addr frameparam; +struct list_head list_entry; +}; + +struct mtk_dip_hw_queue { +struct list_head queue; +struct mutex queuelock;/* protect queue and queue_cnt */ +u32 queue_cnt; +}; + +struct mtk_dip_hw_joblist { +struct list_head queue; +spinlock_t queuelock;/* protect job list */ +u32 queue_cnt; +}; + +struct mtk_dip_hw_thread { +struct task_struct *thread; +wait_queue_head_t wq; +}; + +struct mtk_dip_hw_work { +struct list_head list_entry; +struct img_ipi_frameparam frameparams; +struct mtk_dip_hw_user_id *user_id; +}; + +struct mtk_dip_hw_submit_work { +struct work_struct frame_work; +struct mtk_dip_hw *dip_hw; +}; + +struct mtk_dip_hw_mdpcb_work { +struct work_struct frame_work; +struct img_ipi_frameparam *frameparams; +}; + +struct mtk_dip_hw_clk { +struct clk *img_larb5; +struct clk *img_dip; +}; + +enum frame_state { +FRAME_STATE_INIT =0 , +FRAME_STATE_COMPOSING , +FRAME_STATE_RUNNING , +FRAME_STATE_DONE , +FRAME_STATE_STREAMOFF , +FRAME_STATE_ERROR , +FRAME_STATE_HW_TIMEOUT +}; + +struct mtk_dip_hw { +struct mtk_dip_hw_clk dip_clk; +struct device *larb_dev; +struct mtk_dip_hw_joblist dip_gcejoblist; +struct mtk_dip_hw_queue dip_freebufferlist; +struct mtk_dip_hw_queue dip_usedbufferlist; +struct mtk_dip_hw_thread dip_runner_thread; +struct mtk_dip_hw_queue dip_useridlist; +struct mtk_dip_hw_queue dip_worklist; +struct workqueue_struct *composer_wq; +struct mtk_dip_hw_submit_work submit_work; +wait_queue_head_t composing_wq; +wait_queue_head_t flushing_wq; +atomic_t num_composing;/* increase after ipi */ +/* increase after calling MDP driver */ +atomic_t num_running; +/*MDP/GCE callback workqueue */ +struct workqueue_struct *mdpcb_workqueue; +/* for MDP driver */ +struct platform_device *mdp_pdev; +/* for VPU driver */ +struct platform_device *vpu_pdev; +struct rproc *rproc_handle; +dma_addr_t scp_workingbuf_addr; +/* increase after enqueue */ +atomic_t dip_enque_cnt; +/* increase after Stream ON, decrease when Stream OFF */ +atomic_t dip_stream_cnt; +/* increase after open, decrease when close */ +atomic_t dip_user_cnt; +}; + +int mtk_dip_hw_enqueue (struct mtk_dip_hw *dip_hw, +struct img_ipi_frameparam *frameparams); +int mtk_dip_hw_connect (struct mtk_dip_hw *dip_hw); +int mtk_dip_hw_disconnect (struct mtk_dip_hw *dip_hw); +int mtk_dip_hw_streamon (struct mtk_dip_hw *dip_hw,u16 id); +int mtk_dip_hw_streamoff (struct mtk_dip_hw *dip_hw,u16 id); + +static inline struct mtk_dip_hw_frame_job +*mtk_dip_fparam_to_job (struct img_frameparam *fparam) +{ + return container_of(fparam, struct mtk_dip_hw_frame_job, fparam); +} + +static inline struct mtk_dip_hw_frame_job * +mtk_dip_ipi_fparam_to_job (struct img_ipi_frameparam *ipi_fparam) +{ +return container_of (ipi_fparam, + struct mtk_dip_hw_frame_job, + fparam.frameparam); +} + +#endif /* _MTK_DIP_HW_H_ */ +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.c new file +322
-0@@ -0,0 +1,322 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/module.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> +#include <linux/dma-contiguous.h> +#include <linux/dma-mapping.h> +#include <linux/slab.h> +#include <linux/err.h> +#include <linux/iommu.h> +#include <asm/cacheflush.h> +#include "mtk_dip-smem.h" + +#define MTK_DIP_SMEM_DEV_NAME "MTK-DIP-SMEM" + +static struct reserved_mem *dip_reserved_smem; +static struct dma_map_ops smem_dma_ops; + +struct dma_coherent_mem { +void *virt_base; +dma_addr_t device_base; +unsigned long pfn_base; +int size; +int flags; +unsigned long *bitmap; +spinlock_t spinlock;/* protect dma_coherent_mem member */ +bool use_dev_dma_pfn_offset; +}; + +static struct dma_coherent_mem *dev_get_coherent_memory (struct device *dev) +{ +if (dev && dev->dma_mem) +return dev->dma_mem; +return NULL ; +} + +phys_addr_t mtk_dip_smem_iova_to_phys (struct mtk_dip_smem_dev *smem_dev, +dma_addr_t iova) +{ +struct iommu_domain *smem_dom; +phys_addr_t addr; +phys_addr_t limit; + +if (!smem_dev) +return 0 ; + + smem_dom =iommu_get_domain_for_dev (smem_dev->dev.parent); + +if (!smem_dom) +return 0 ; + + addr =iommu_iova_to_phys (smem_dom, iova); + + limit = smem_dev->smem_base + smem_dev->smem_size; + +if (addr < smem_dev->smem_base || addr >= limit) { +dev_err (&smem_dev->dev, +"Unexpected scp_daddr %pa (must >= %pa and <%pa)\n" , + &addr, &smem_dev->smem_base, &limit); +return 0 ; + } +dev_dbg (&smem_dev->dev,"Pa verifcation pass: %pa(>=%pa, <%pa)\n" , + &addr, &smem_dev->smem_base, &limit); +return addr; +} + +/******************************************** +* MTK DIP SMEM DMA ops * +********************************************/ +static int mtk_dip_smem_get_sgtable (struct device *dev, +struct sg_table *sgt, +void *cpu_addr, +dma_addr_t dma_addr, +size_t size,unsigned long attrs) +{ +struct mtk_dip_smem_dev *smem_dev =dev_get_drvdata (dev); +int n_pages_align; +int size_align; +int page_start; +unsigned long long offset_p; + +phys_addr_t paddr =mtk_dip_smem_iova_to_phys (smem_dev, dma_addr); + + offset_p = (unsigned long long )paddr - + (unsigned long long )smem_dev->smem_base; + +dev_dbg (dev,"%s: dma_addr(%p), cpu_addr(%p), pa(%p), size(%d)\n" , + __func__, dma_addr, cpu_addr, paddr, size); + + size_align =round_up (size,PAGE_SIZE ); + n_pages_align = size_align >>PAGE_SHIFT ; + page_start = offset_p >>PAGE_SHIFT ; + +dev_dbg (dev,"%s: page_start(%d), page pa(%p), pa(%p), aligned size(%d)\n" , + __func__, + page_start, +page_to_phys (*(smem_dev->smem_pages + page_start)), + paddr, + size_align + ); + +if (!smem_dev) { +dev_err (dev,"can't get sgtable from smem_dev\n" ); +return -EINVAL ; + } + +dev_dbg (dev,"%s: get sgt of the smem: %d pages\n" , __func__, + n_pages_align); + +return sg_alloc_table_from_pages (sgt, + smem_dev->smem_pages + page_start, + n_pages_align, +0 , size_align,GFP_KERNEL ); +} + +static void *mtk_dip_smem_get_cpu_addr (struct mtk_dip_smem_dev *smem_dev, +struct scatterlist *sg) +{ +struct device *dev = &smem_dev->dev; +struct dma_coherent_mem *dma_mem = +dev_get_coherent_memory (dev); + +phys_addr_t addr = (phys_addr_t )sg_phys (sg); + +if (addr < smem_dev->smem_base || + addr > smem_dev->smem_base + smem_dev->smem_size) { +dev_err (dev,"%s: Invalid paddr %p from sg\n" , __func__, addr); +return NULL ; + } + +return dma_mem->virt_base + (addr - smem_dev->smem_base); +} + +static void mtk_dip_smem_sync_sg_for_cpu (struct device *dev, +struct scatterlist *sgl, +int nelems, +enum dma_data_direction dir) +{ +struct mtk_dip_smem_dev *smem_dev = +dev_get_drvdata (dev); +void *cpu_addr; + + cpu_addr =mtk_dip_smem_get_cpu_addr (smem_dev, sgl); + +dev_dbg (dev,"%s: paddr(%p),vaddr(%p),size(%d)\n" , + __func__,sg_phys (sgl), cpu_addr, sgl->length); + +if (cpu_addr) +__dma_unmap_area (cpu_addr, sgl->length, dir); +} + +static void mtk_dip_smem_sync_sg_for_device (struct device *dev, +struct scatterlist *sgl, +int nelems, +enum dma_data_direction dir) +{ +struct mtk_dip_smem_dev *smem_dev = +dev_get_drvdata (dev); +void *cpu_addr; + + cpu_addr =mtk_dip_smem_get_cpu_addr (smem_dev, sgl); + +dev_dbg (dev,"%s: pa(%p),va(%p),size(%d),dir(%d)\n" , + __func__,sg_phys (sgl), cpu_addr, sgl->length, dir); + +if (cpu_addr) +__dma_map_area (cpu_addr, sgl->length, dir); +} + +static int mtk_dip_smem_setup_dma_ops (struct device *dev, +struct device *default_alloc_dev) +{ +memcpy ((void *)&smem_dma_ops, default_alloc_dev->dma_ops, +sizeof (smem_dma_ops)); + + smem_dma_ops.get_sgtable = + mtk_dip_smem_get_sgtable; + smem_dma_ops.sync_sg_for_device = + mtk_dip_smem_sync_sg_for_device; + smem_dma_ops.sync_sg_for_cpu = + mtk_dip_smem_sync_sg_for_cpu; + + dev->dma_ops = &smem_dma_ops; + +dev_dbg (dev,"setup smem_dma_ops: %p\n" , dev->dma_ops); + +return 0 ; +} + +void mtk_dip_smem_alloc_dev_release (struct mtk_dip_smem_dev *smem_dev) +{ +device_unregister (&smem_dev->dev); +} + +int mtk_dip_smem_alloc_dev_init (struct mtk_dip_smem_dev *smem_dev, +struct device *parent) +{ +int ret; +struct device *dev = &smem_dev->dev; + + dev->parent = parent; +dev_set_name (&smem_dev->dev,"dip-smem" ); + + ret =device_register (dev); + +if (ret) +dev_err (parent,"Failed to register smem device\n" ); + +dev_dbg (dev,"init alloc dev(%p), parent(%p)\n" , dev, dev->parent); + +dev_set_drvdata (dev, smem_dev); + +if (dip_reserved_smem) { +dma_addr_t dma_addr; +phys_addr_t addr; +struct iommu_domain *smem_dom; +int i; +int size_align; +struct page **pages; +int n_pages; +struct sg_table *sgt = &smem_dev->sgt; + + size_align =round_down (dip_reserved_smem->size,PAGE_SIZE ); + n_pages = size_align >>PAGE_SHIFT ; + pages =kmalloc_array (n_pages,sizeof (struct page *), +GFP_KERNEL ); + +if (!pages) +return -ENOMEM ; + +for (i =0 ; i < n_pages; i++) + pages[i] =phys_to_page (dip_reserved_smem->base + + i *PAGE_SIZE ); + + ret =sg_alloc_table_from_pages (sgt, pages, n_pages,0 , + size_align,GFP_KERNEL ); + +if (ret) { +dev_err (dev,"failed to get alloca sg table\n" ); +return -ENOMEM ; + } + +dma_map_sg_attrs (parent, sgt->sgl, sgt->nents, +DMA_BIDIRECTIONAL , +DMA_ATTR_SKIP_CPU_SYNC ); + + dma_addr =sg_dma_address (sgt->sgl); + smem_dom =iommu_get_domain_for_dev (parent); + addr =iommu_iova_to_phys (smem_dom, dma_addr); + +if (addr != dip_reserved_smem->base) +dev_warn (dev, +"incorrect pa(%p) from iommu_iova_to_phys, should be %p\n" , + addr, dip_reserved_smem->base); + + ret =dma_declare_coherent_memory (dev, + dip_reserved_smem->base, + dma_addr, size_align, +DMA_MEMORY_EXCLUSIVE ); + +dev_dbg (dev,"Coherent mem base(%p,%p),size(%lx),ret(%d)\n" , + dip_reserved_smem->base, dma_addr, size_align, ret); + + smem_dev->smem_base = dip_reserved_smem->base; + smem_dev->smem_size = size_align; + smem_dev->smem_pages = pages; + smem_dev->num_smem_pages = n_pages; + smem_dev->smem_dma_base = dma_addr; + +dev_dbg (dev,"smem_dev setting (%p,%lx,%p,%d)\n" , + smem_dev->smem_base, smem_dev->smem_size, + smem_dev->smem_pages, smem_dev->num_smem_pages); + } + + ret =mtk_dip_smem_setup_dma_ops (dev, parent); + +return ret; +} + +static int __init mtk_dip_smem_dma_setup (struct reserved_mem *rmem) +{ +unsigned long node = rmem->fdt_node; + +if (of_get_flat_dt_prop (node,"reusable" ,NULL )) +return -EINVAL ; + +if (!of_get_flat_dt_prop (node,"no-map" ,NULL )) { +pr_err ("Reserved memory: regions without no-map are not yet supported\n" ); +return -EINVAL ; + } + + dip_reserved_smem = rmem; + +pr_debug ("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n" , + &rmem->base, (unsigned long )rmem->size /SZ_1M ); +return 0 ; +} + +RESERVEDMEM_OF_DECLARE (mtk_dip_smem, +"mediatek,reserve-memory-dip_smem" , + mtk_dip_smem_dma_setup); + +MODULE_AUTHOR ("Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("Mediatek Camera DIP shared memory alloc device" ); +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h new file +39
-0@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 _MTK_DIP_SMEM_H_ +#define _MTK_DIP_SMEM_H_ + +#include <linux/dma-mapping.h> +#include <linux/device.h> + +struct mtk_dip_smem_dev { +struct device dev; +struct sg_table sgt; +struct page **smem_pages; +int num_smem_pages; +phys_addr_t smem_base; +dma_addr_t smem_dma_base; +int smem_size; +}; + +phys_addr_t mtk_dip_smem_iova_to_phys (struct mtk_dip_smem_dev *smem_dev, +dma_addr_t iova); +int mtk_dip_smem_alloc_dev_init (struct mtk_dip_smem_dev *smem_dev, +struct device *default_alloc_dev); +void mtk_dip_smem_alloc_dev_release (struct mtk_dip_smem_dev *smem_dev); + +#endif /*_MTK_DIP_SMEM_H_*/ +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +84
-0@@ -0,0 +1,1384 @@ +// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Holmes Chiou <holmes.chiou-NuS5LvNUpcJWk0Htik3J/[email protected]> +* +* 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 <linux/of_device.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/kthread.h> +#include <linux/pm_runtime.h> +#include <linux/dma-iommu.h> +#include <linux/spinlock.h> +#include <linux/slab.h> +#include <linux/remoteproc.h> +#include <linux/platform_data/mtk_scp.h> +#include "mtk-mdp3-cmdq.h" +#include "mtk_dip-dev.h" +#include "mtk_dip-hw.h" + +#define DIP_DEV_NAME "camera-dip" + +#define DIP_COMPOSER_THREAD_TIMEOUT 16U +#define DIP_COMPOSING_WQ_TIMEOUT 16U +#define DIP_COMPOSING_MAX_NUM 3 +#define DIP_FLUSHING_WQ_TIMEOUT 16U +#define DIP_MAX_ERR_COUNT 188U + +#define DIP_FRM_SZ (76 * 1024) +#define DIP_SUB_FRM_SZ (16 * 1024) +#define DIP_TUNING_SZ (32 * 1024) +#define DIP_COMP_SZ (24 * 1024) +#define DIP_FRAMEPARAM_SZ (4 * 1024) + +#define DIP_TUNING_OFFSET DIP_SUB_FRM_SZ +#define DIP_COMP_OFFSET (DIP_TUNING_OFFSET + DIP_TUNING_SZ) +#define DIP_FRAMEPARAM_OFFSET (DIP_COMP_OFFSET + DIP_COMP_SZ) +#define DIP_SUB_FRM_DATA_NUM 32 +#define DIP_SCP_WORKINGBUF_OFFSET (5 * 1024 * 1024) + +static inline struct mtk_dip_hw *get_dip_device (struct device *dev) +{ +struct mtk_dip_dev *dip_dev =dev_get_drvdata (dev); + +if (dip_dev) +return &dip_dev->dip_hw; +else +return NULL ; +} + +static struct img_frameparam *dip_create_framejob (int sequence) +{ +struct mtk_dip_hw_frame_job *fjob; + + fjob =kzalloc (sizeof (*fjob),GFP_ATOMIC ); + +if (!fjob) +return NULL ; + + fjob->sequence = sequence; + +return &fjob->fparam; +} + +static void dip_free_framejob (struct img_frameparam *fparam) +{ +struct mtk_dip_hw_frame_job *fjob; + + fjob =mtk_dip_fparam_to_job (fparam); + +/* to avoid use after free issue */ + fjob->sequence =-1 ; + +kfree (fjob); +}drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 94
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ +static void dip_enable_ccf_clock (struct mtk_dip_hw *dip_hw) +{ +struct mtk_dip_dev *dip_dev; +int ret; + + dip_dev =mtk_dip_hw_to_dev (dip_hw); + ret =pm_runtime_get_sync (dip_hw->larb_dev); +if (ret <0 ) +dev_err (&dip_dev->pdev->dev,"%cannot get smi larb clock\n" );Uhm, this is not a clock operation.
Quoted 4 lines
The driver must get a runtime PM reference whenever the hardware power domain needs to stay powered on. In other words, as long as the hardware needs to preserve some state (in the registers, SRAM, etc.), the runtime PM status must be active.
I got it.
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 105
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ + ret =clk_prepare_enable (dip_hw->dip_clk.img_larb5); +if (ret) +dev_err (&dip_dev->pdev->dev, +"cannot prepare and enable img_larb5 clock\n" ); + + ret =clk_prepare_enable (dip_hw->dip_clk.img_dip); +if (ret) +dev_err (&dip_dev->pdev->dev, +"cannot prepare and enable img_dip clock\n" ); +}There should be no need to have this function. Instead, you could use the
clk_bulk_prepare_enable()API.
I will remove the function and use clk_bulk_prepare_enable() and separated pm_runtime_get_sync() if needed.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 112
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0+ +static void dip_disable_ccf_clock (struct mtk_dip_hw *dip_hw) +{ +clk_disable_unprepare (dip_hw->dip_clk.img_dip); +clk_disable_unprepare (dip_hw->dip_clk.img_larb5); +pm_runtime_put_sync (dip_hw->larb_dev); +}See above.
I will do the same change as dip_enable_ccf_clock().
Quoted 32 lines
Quoted 32 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +31
-0+ +static int dip_send (struct platform_device *pdev,enum scp_ipi_id id, +void *buf,unsigned int len,unsigned int wait) +{ +return scp_ipi_send (pdev, id, buf, len, wait); +} + +static struct mtk_dip_pipe *get_mtk_dip_pipe (struct mtk_dip_dev *dip_dev, +unsigned int pipe_id) +{ +if (pipe_id <0 && pipe_id >=MTK_DIP_PIPE_ID_TOTAL_NUM ) +return NULL ; +return &dip_dev->dip_pipe[pipe_id]; +} + +static void call_mtk_dip_pipe_finish (struct mtk_dip_hw *dip_hw, +struct img_ipi_frameparam *iparam) +{ +struct mtk_dip_dev *dip_dev; +struct mtk_dip_pipe *dip_pipe; +enum vb2_buffer_state vbf_state; +int pipe_id; +int ret; + +if (!dip_hw) { +pr_err ("%s: can't update buffer status, dip_hw is NULL\n" , + __func__); +return ; + } + + dip_dev =mtk_dip_hw_to_dev (dip_hw);
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 149
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+ +if (!iparam) { +dev_dbg (&dip_dev->pdev->dev,"%s: iparam can't be NULL\n" , + __func__); +return ; + }None of the 2 error conditions above should be possible happen.
I will remove the 2 checks.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 156
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0+ + pipe_id =mtk_dip_pipe_get_pipe_from_job_id (iparam->index); + dip_pipe =get_mtk_dip_pipe (dip_dev, pipe_id); + +if (!dip_pipe) { +dev_dbg (&dip_dev->pdev->dev, +"%s: unknown pipe id(%d)\n" , __func__, pipe_id);Since this is a sign of some serious problem, I'd make it
dev_err().
I will change it to error level.
Quoted 17 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+return ; + } + +if (iparam->state ==FRAME_STATE_ERROR )drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 170
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ vbf_state =VB2_BUF_STATE_ERROR ; + else + vbf_state =VB2_BUF_STATE_DONE ; + +dev_dbg (&dip_dev->pdev->dev, +"%s: ready to return buffers,pipe(%d),pipe_job_id(%d)\n" , + __func__, pipe_id, iparam->index); + + ret =mtk_dip_pipe_job_finish (dip_pipe, iparam->index, vbf_state); +Unnecessary blank line.
I got it.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 173
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+if (ret) +dev_dbg (&dip_dev->pdev->dev,"%s: finish CB failed(%d)\n" , + __func__, ret);I don't see why it would ever fail. It should be just made a void function.
I will change it to void.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 176
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+} + +static void mtk_dip_notify (void *data)Why void?
It should not be void. I will improve the function and return the error when we get hardware timeout or failed result.
Quoted 104 lines
Quoted 104 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +103
-0+{ +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct img_frameparam *framejob; +struct mtk_dip_hw_user_id *user_id; +struct mtk_dip_hw_subframe *buf, *tmpbuf; +struct img_ipi_frameparam *frameparam; +u32 num; +bool found = false; + + frameparam = (struct img_ipi_frameparam *)data; + dip_hw = (struct mtk_dip_hw *)frameparam->drv_data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); + framejob =container_of (frameparam, + struct img_frameparam, + frameparam); + +if (frameparam->state ==FRAME_STATE_HW_TIMEOUT ) {M + dip_send(dip_hw->vpu_pdev, SCP_IPI_DIP_FRAME, + (void *)frameparam, sizeof(*frameparam), 0); +dev_err (&dip_dev->pdev->dev,"%s: frame no(%d) HW timeout\n" , + __func__, frameparam->frame_no); + } + +mutex_lock (&dip_hw->dip_usedbufferlist.queuelock); +list_for_each_entry_safe (buf, tmpbuf, + &dip_hw->dip_usedbufferlist.queue, + list_entry) { +if (buf->buffer.pa == frameparam->subfrm_data.pa) { +list_del (&buf->list_entry); + dip_hw->dip_usedbufferlist.queue_cnt--; + found = true; +dev_dbg (&dip_dev->pdev->dev, +"%s: Found used buffer(%x)\n" , + __func__, buf->buffer.pa); +break ; + } + } +mutex_unlock (&dip_hw->dip_usedbufferlist.queuelock); + +if (!found) { +dev_err (&dip_dev->pdev->dev, +"%s: frame_no(%d), buf(%x), used buf cnt(%d)\n" , + __func__, frameparam->frame_no, + frameparam->subfrm_data.pa, + dip_hw->dip_usedbufferlist.queue_cnt); + + frameparam->state =FRAME_STATE_ERROR ; + + }else { +mutex_lock (&dip_hw->dip_freebufferlist.queuelock); +list_add_tail (&buf->list_entry, + &dip_hw->dip_freebufferlist.queue); + dip_hw->dip_freebufferlist.queue_cnt++; +mutex_unlock (&dip_hw->dip_freebufferlist.queuelock); + + frameparam->state =FRAME_STATE_DONE ; + } + +call_mtk_dip_pipe_finish (dip_hw, frameparam); + + found = false; +mutex_lock (&dip_hw->dip_useridlist.queuelock); +list_for_each_entry (user_id, + &dip_hw->dip_useridlist.queue, + list_entry) { +if (mtk_dip_pipe_get_pipe_from_job_id (frameparam->index) + == user_id->id) { + user_id->num--; +dev_dbg (&dip_dev->pdev->dev, +"%s: user_id(%x) found, cnt(%d)\n" , + __func__, user_id->id, user_id->num); + found = true; +break ; + } + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); +wake_up (&dip_hw->flushing_wq); +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) is finished\n" , + __func__, framejob->frameparam.frame_no); +dip_free_framejob (framejob); + + num =atomic_dec_return (&dip_hw->num_running); +dev_dbg (&dip_dev->pdev->dev,"%s: running cnt(%d)\n" , __func__, num); +} + +static void mdp_cb_worker (struct work_struct *work) +{ +struct mtk_dip_hw_mdpcb_work *mdpcb_work; + + mdpcb_work = container_of(work, struct mtk_dip_hw_mdpcb_work, + frame_work); +mtk_dip_notify (mdpcb_work->frameparams); +kfree (mdpcb_work); +} + +static struct img_ipi_frameparam *convert_to_fparam (struct cmdq_cb_data *data) +{ +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_frame_job *fjob; +struct img_ipi_frameparam *ipi_fparam;
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 285
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+ +if (!data) { +pr_err ("%s: cmdq_cb_data can't be NULL\n" , + __func__); +return NULL ; + }This is impossible to happen with the way this function is called.
I will remove this check.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 289
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ +if (data->sta !=CMDQ_CB_NORMAL ) +pr_debug ("%s: got CMDQ CB(%d) without CMDQ_CB_NORMAL\n" , + __func__, data->sta);Is this a condition that could happen normally on a system working correctly?
No, it couldn't. I would like to return NULL here.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 293
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ +if (!data->data) { +pr_err ("%s: got NULL in cmdq_cb_data\n" , + __func__);Use
dev_err()and also make the error message more descriptive, e.g. "%s:data->datais NULL"
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 297
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+return NULL ; + } + + fjob =mtk_dip_ipi_fparam_to_job (data->data);Hmm, if we want struct
mtk_dip_hw_frame_jobhere, why don't we just pass it to the cmdq driver with the callback?
I will pass mtk_dip_hw_frame_job instead.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 302
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ +if (fjob->sequence ==-1 ) { +pr_err ("%s: Invalid cmdq_cb_data(%p)\n" , + __func__, data); + ipi_fparam =NULL ;As far as I can see, we always get the data we explicitly gave to the cmdq driver together with the callback function, so it sounds like we shouldn't be able to get invalid data here.
I'm not sure if we can always trust CMDQ callback since we had suffered from an CMDQ bug that return an invalid address before.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 305
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ }else { + ipi_fparam = &fjob->fparam.frameparam; + dip_hw = (struct mtk_dip_hw *)ipi_fparam->drv_data;Hmm, isn't
ipi_fparama firmware ABI struct? It shouldn't contain kernel pointers.
We will remove this line. We use it to get the dip driver instance back when handling VPU/SCP callback, but SCP driver already supports priv which can be used instead.
Quoted 16 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ dip_dev =mtk_dip_hw_to_dev (dip_hw); + } + + dev_dbg(&dip_dev->pdev->dev, "%s: framejob(%p), seq(%d)\n",drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 319
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ __func__, fjob, fjob->sequence); +dev_dbg (&dip_dev->pdev->dev,"%s: idx(%d), no(%d), s(%d), n_in(%d), n_out(%d), drv(%p)\n" , + __func__, + fjob->fparam.frameparam.index, + fjob->fparam.frameparam.frame_no, + fjob->fparam.frameparam.state, + fjob->fparam.frameparam.num_inputs, + fjob->fparam.frameparam.num_outputs, + fjob->fparam.frameparam.drv_data + );
Quoted 1 line
This would crash if the
fjob->dequence== -1 case of the if/else above hit.
I would like to return NULL first in the case of fjob->sequence == -1.
Quoted 21 lines
Quoted 21 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +20
-0+ +return ipi_fparam; +} + +/* Maybe in IRQ context of cmdq */ +static void dip_mdp_cb_func (struct cmdq_cb_data data) +{ +struct img_ipi_frameparam *frameparam; +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_mdpcb_work *mdpcb_work; + + frameparam =convert_to_fparam (&data); + +if (!frameparam) { +pr_err ("%s: return due to NULL cmdq_cb_data)" , + __func__, &data); +return ; + } +
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 343
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ dip_hw = (struct mtk_dip_hw *)frameparam->drv_data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); + + mdpcb_work =kzalloc (sizeof (*mdpcb_work),GFP_ATOMIC );We shouldn't need to allocate anything here. Normally one would just look up some internal driver structure matching the completed job and the work would be embedded there.
I would like to remove the allocation here since we won't need the workqueue in normal case.
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 354
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ +if (WARN_ONCE (!mdpcb_work,"%s: frame_no(%d) is lost" , + __func__, frameparam->frame_no)) +return ; + +INIT_WORK (&mdpcb_work->frame_work, mdp_cb_worker); + mdpcb_work->frameparams = frameparam; +if (data.sta !=CMDQ_CB_NORMAL ) + mdpcb_work->frameparams->state =FRAME_STATE_HW_TIMEOUT ; + +queue_work (dip_hw->mdpcb_workqueue, &mdpcb_work->frame_work);Looking at
mdp_cb_worker()andmtk_dip_notify()called by it, after fixing the locking to use spinlocks rather than mutexes and remove some dynamic allocations pointed out in other comments, we could just run them in atomic context, without the need for this workqueue.
I will re-design this part to support the function to be run in atomic context.
I would like to discuss the error handling in this function for the next patch. When we get FRAME_STATE_HW_TIMEOUT, is it suitable to trigger a work to notify SCP with scp_ipi_send() to dump debug messages in further? (Can this kind of debugging function be upstream?)
Quoted 18 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+} + +static void dip_vpu_handler (void *data,unsigned int len,void *priv) +{ +struct img_frameparam *framejob; +struct img_ipi_frameparam *frameparam;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 370
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +unsigned long flags; +u32 num; + +if (WARN_ONCE (!data,"%s: failed due to NULL data\n" , __func__)) +return ; + + frameparam = (struct img_ipi_frameparam *)data; + framejob =dip_create_framejob (frameparam->index);
Quoted 7 lines
Rather than creating this dynamically, it should be already created. The reason you have the priv argument to this function is that you can have the SCP driver give to you a pointer to some struct that you gave to it when calling
scp_ipi_register(). That struct should have a list of valid VPU jobs and here you should iterate through that list and find a matching job or fail if there is no matching one. (We need to validate here, because we can't trust the values coming from the firmware.)
May I embedded img_frameparam into the extended media_request object so that it can be managed with media_request objects?
struct mtk_dip_request {
struct media_request request;
struct mtk_dip_pipe_job_info job_info;
struct mtk_dip_hw_work dip_work;
struct img_frameparam job;
struct mtk_dip_hw_mdpcb_timeout_work timeout_work;
};Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 381
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ +if (WARN_ONCE (!framejob,"%s: frame_no(%d) is lost\n" , + __func__, frameparam->frame_no)) +return ; + + dip_hw = (struct mtk_dip_hw *)frameparam->drv_data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); + +wake_up (&dip_hw->composing_wq); +memcpy (&framejob->frameparam, data,sizeof (framejob->frameparam)); + num =atomic_dec_return (&dip_hw->num_composing);The order here is wrong. If you wake up before decrementing, you may end up making the woken up thread wait again, because the value is still not decremented.
I will move this line above wake_up().
Quoted 42 lines
Quoted 28 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +27
-0+ +spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, flags); +list_add_tail (&framejob->list_entry, &dip_hw->dip_gcejoblist.queue); + dip_hw->dip_gcejoblist.queue_cnt++; +spin_unlock_irqrestore (&dip_hw->dip_gcejoblist.queuelock, flags); + +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) is back, composing num(%d)\n" , + __func__, frameparam->frame_no, num); + +wake_up (&dip_hw->dip_runner_thread.wq); +} + +static int dip_runner_func (void *data) +{ +struct img_frameparam *framejob; +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_user_id *user_id; +unsigned long flags; +bool found; +u32 queuecnt, num; +int ret; + + dip_hw = (struct mtk_dip_hw *)data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 418
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+while (1 ) { +spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, flags); + queuecnt = dip_hw->dip_gcejoblist.queue_cnt; +spin_unlock_irqrestore (&dip_hw->dip_gcejoblist.queuelock, + flags); + + ret =wait_event_interruptible_timeout + (dip_hw->dip_runner_thread.wq, + queuecnt ||kthread_should_stop (), +msecs_to_jiffies (DIP_COMPOSER_THREAD_TIMEOUT ));Checking queuecnt here is also wrong. Please check my comment to another wait_event_* in this patch.
Quoted 6 lines
Also the interruptibility and timeout don't make sense here, because we just want to keep waiting unless something shows up or the kthread is forcefully woken up for stopping.
However, we probably want it to be
freezable(), so that we don't have to bring the thread down and up on suspend/resume.
I would like to fix it as following:
static bool mtk_dip_hw_qce_queuecnt(struct mtk_dip_hw *dip_hw)
{
int queuecnt;
spin_lock_irqsave(&dip_hw->dip_gcejoblist.queuelock, flags);
queuecnt = dip_hw->dip_gcejoblist.queue_cnt;
spin_unlock_irqrestore(&dip_hw->dip_gcejoblist.queuelock,
return queuecnt;
}static int dip_runner_func(void *data)
{
//...
set_freezable();
while(1) {
wait_event_freezable((dip_hw->dip_runner_thread.wq,
mtk_dip_hw_qce_queuecnt() ||
kthread_should_stop());
if (kthread_should_stop())
break;
// Call MDP/GCE API to do HW excecution
// ...
}
}Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 429
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ +if (kthread_should_stop ()) +break ; + +if (ret ==0 ) { +/* Timeout */ + ret = -ETIME ; + }else if (ret == -ERESTARTSYS ) { +dev_err (&dip_dev->pdev->dev, +"%s: interrupted by a signal\n" , __func__); + }All this will not be needed after fixing the comment above.
I will remove the lines.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 431
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0+ +if (queuecnt >0 ) {You can invert this condition and use continue to just go back to waiting again and reduce the code complexity.
Still, it shouldn't be possible to end up without a job in the queue anymore after fixing the waiting, as per the other comments above.
I would like to remove the queuecnt check after fixing the above waiting,
Quoted 41 lines
Quoted 41 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +40
-0+spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, + flags); + framejob =list_first_entry + (&dip_hw->dip_gcejoblist.queue, + struct img_frameparam, list_entry); + + dip_hw->dip_gcejoblist.queue_cnt--; +list_del (&framejob->list_entry); +spin_unlock_irqrestore + (&dip_hw->dip_gcejoblist.queuelock, flags); + + found = false; +mutex_lock (&dip_hw->dip_useridlist.queuelock); +list_for_each_entry (user_id, + &dip_hw->dip_useridlist.queue, + list_entry) { +int id = framejob->frameparam.index; + +if (mtk_dip_pipe_get_pipe_from_job_id (id) == + user_id->id) { + found = true; +break ; + } + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + +if (!found) { +dev_err (&dip_dev->pdev->dev, +"%s: frame_no(%d), idx(0x%x) is abnormal\n" , + __func__, + framejob->frameparam.frame_no, + framejob->frameparam.index); +/* +* Due to error index, DIP driver could NOT +* notify the V4L2 common driver to +* return buffer +*/ +dip_free_framejob (framejob); +continue ; + }
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 474
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ +mutex_lock (&dip_hw->dip_useridlist.queuelock); +if (user_id->state ==DIP_STATE_STREAMOFF ) {I'd handle this in the streamoff function to avoid polluting the main path with handling of special stop conditions. As suggested in the other similar place, we should just remove the jobs from the list there, so in this thread we wouldn't end up with any jobs from any "users" being stopped.
I agree with you. I will move the stream off logics to streamoff function.
Quoted 30 lines
Quoted 30 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +30
-0+ user_id->num--; +mutex_unlock + (&dip_hw->dip_useridlist.queuelock); + framejob->frameparam.state = +FRAME_STATE_STREAMOFF ; +call_mtk_dip_pipe_finish (dip_hw, + &framejob->frameparam); + +dev_dbg (&dip_dev->pdev->dev, +"%s: user_id(%x) streamoff, current num(%d); frame_no(%d) flushed\n" , + __func__, user_id->id, user_id->num, + framejob->frameparam.frame_no); + +dip_free_framejob (framejob); +continue ; + } +mutex_unlock (&dip_hw->dip_useridlist.queuelock); + +dev_dbg (&dip_dev->pdev->dev, +"%s: MDP run frame_no(%d) and the rest joblist cnt(%d)\n" , + __func__, framejob->frameparam.frame_no, + dip_hw->dip_gcejoblist.queue_cnt); + +/* +* Call MDP/GCE API to do HW excecution +* Pass the framejob to MDP driver +*/ + framejob->frameparam.state =FRAME_STATE_COMPOSING ; + + mdp_cmdq_sendtask
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 510
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+ (dip_hw->mdp_pdev, + (struct img_config *) + framejob->frameparam.config_data.va, + &framejob->frameparam,NULL , false, + dip_mdp_cb_func, + (void *)&framejob->frameparam);These pointer casts shouldn't be needed.
I will remove it.
Quoted 30 lines
Quoted 30 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +29
-0+ + num =atomic_inc_return (&dip_hw->num_running); +dev_dbg (&dip_dev->pdev->dev, +"%s,MDP running num(%d)\n" , __func__, num); + } + + }; + +return 0 ; +} + +static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); + +mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work =list_first_entry (&dip_hw->dip_worklist.queue, + struct mtk_dip_hw_work, list_entry); +list_del (&dip_work->list_entry); + dip_hw->dip_worklist.queue_cnt--;
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 544
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ len = dip_hw->dip_worklist.queue_cnt; +mutex_unlock (&dip_hw->dip_worklist.queuelock); + +mutex_lock (&dip_hw->dip_useridlist.queuelock); +if (dip_work->user_id->state ==DIP_STATE_STREAMOFF ) {This shouldn't be possible. If we're stopping the streaming, we should remove any
dip_workof that user from the list, so we shouldn't be able to end up here.
I will make sure that we remove any dip_works in streamoff and remove the streamoff handling codes below.
Quoted 25 lines
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0+ dip_work->user_id->num--; +mutex_unlock (&dip_hw->dip_useridlist.queuelock);Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 556
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+ + dip_work->frameparams.state =FRAME_STATE_STREAMOFF ; +call_mtk_dip_pipe_finish (dip_hw, &dip_work->frameparams); + +dev_dbg (&dip_dev->pdev->dev, +"%s: user_id(%x) is streamoff,num(%d),frame_no(%d),idx:0x%x\n" , + __func__, dip_work->user_id->id, + dip_work->user_id->num, + dip_work->frameparams.frame_no, + dip_work->frameparams.index);Waiting on a local variable?
Quoted 2 lines
Perhaps instead of a custom wait, we could use a semaphore initialized to
DIP_COMPOSING_MAX_NUM?
I would like to use semaphore here.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The interruptible variant doesn't make sense here. There is no reason why a workqueue could be interrupted.
I got it.
Quoted 27 lines
Quoted 27 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +26
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is incorrect. Any request that went through
req_validatemust not fail for reasons other than an unexpectedfirmware/hardwarefailure. The driver must be able to handle arbitrary number of requests. (In practice, the limit of requests is limited by the number of VB2 buffers.)
I got it. We will ensure that DIP can handle arbitrary number of requests after passing req_validate.
Quoted 26 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 23 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +22
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
These are typed struct members, so you can just assign them:
Quoted 2 lines
dip_work->frameparams.subfrm_data=buf->buffer;
I would like to use the assignment instead.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
No cast should be needed here.
I will fix it.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
I got it.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
I got it.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
I got it.
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
I got it.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
I will remove this unnecessary line.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Passing kernel pointers to firmware?
I will remove this line.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There shouldn't be a need to type cast the pointer.
I will fix it.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
I got it.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why the assignment? Perhaps you just want
atomic_inc()?
I would like to use atomic_inc instead.
Quoted 5 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We haven't allocated this object and so we shouldn't free it here. The layer that allocated it should receive it back and free. (But we probably don't need to allocate it dynamically as per my other comments.)
May I also merge dip_work into mtk_dip_request?
struct mtk_dip_request {
struct media_request request;
struct mtk_dip_pipe_job_info job_info;
struct mtk_dip_hw_work dip_work;
struct img_frameparam job;
struct mtk_dip_hw_mdpcb_timeout_work timeout_work;
};Quoted 11 lines
Also a general note - a work can be queued only once. This means that current code races when two
dip_worksare attempted to be queued very quickly one after another (or even at the same time from different threads).I can think of two potential options for fixing this:
1) Loop in the work function until there is nothing to queue to the hardware anymore - but this needs tricky synchronization, because there is still short time at the end of the work function when a new
dip_workcould be added.
Quoted 8 lines
2) Change this to a kthread that just keeps running in a loop waiting for some available
dip_workto show up and then sending it to the firmware. This should be simpler, as the kthread shouldn't have a chance to miss anydip_workqueued.I'm personally in favor of option 2, as it should simplify the synchronization.
I would like to re-design this part with a kthread in the next patch.
Quoted 9 lines
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There is no value in having this function. Just call the enable/disable functions directly.
I will remove mtk_dip_hw_set_clk().
Quoted 36 lines
Quoted 36 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The related work seems to do a very simple task, so is there really a reason to have a separate workqueue for it?
I will redesign the work so that it can be executed in interrupt context and remove dip_hw->mdpcb_workqueue.
Quoted 108 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 104 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +104
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We're operating on a physically contiguous memory here (i.e. on a contiguous range of pages), so is there really a need to have an SG table for it?
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I guess you just want to call
dma_map_single_attrs()with the kernel VA here.
I got it. I will use dma_map_single_attrs() instead.
Quoted 19 lines
Quoted 19 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +19
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
But actually, why aren't these buffers managed by VB2?
I would like to manage the buffer with VB2, but I'm not sure what is the right way to do that.
These are DIP internal working buffers. The buffers are not read or written by user application. In this case, could I add a meta capture video device to manage them or integrate the buffers with tuning meta output buffer directly?
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please name the labels after the first cleanup step to be performed after the jump.
I got it. I will fix this part.
Quoted 31 lines
Quoted 31 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +31
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There shouldn't be anything in the worklist anymore at this point. Each "user" should be respnsible for cleaning after itself.
Do you mean that we should clean the works when streaming off each dip sub device?
Quoted 41 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Ditto.
Quoted 21 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +21
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This isn't a very good pattern. We use a constant number of buffers, so we can just have an array in struct
dip_hwthat contains points to all the allocatedmtk_dip_hw_subframestructs.
I will use array instead if we can't use VB2 to managing the buffers.
Quoted 41 lines
Quoted 41 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +41
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Spinlock would be a better candidate here.
I would like to use spinlock instead.
Quoted 25 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
What is this condition expected to do? num is a local variable in this function and nobody can change it asynchronously.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Do you perhaps mean something like:
static bool mtk_dip_hw_queue_empty(struct
mtk_dip_hw*dip_hw,
structmtk_dip_hw_user_id*user_id){ int num; mutex_lock(&dip_hw->dip_useridlist.queuelock); num = user_id->num; mutex_unlock(&dip_hw->dip_useridlist.queuelock); return !num; }
Quoted 5 lines
and then later in this function:
ret = wait_event*(dip_hw->flushing_wq, mtk_dip_hw_queue_empty(dip_hw, user_id), ...);
Yes, it's what we want to implement. I will fix it.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There is no point in using the interruptible variant of
wait_eventif we can't just abort on an interrupt.Given that this is only called from streamoff, we can't abort, so we should use
wait_event_timeout().
I got it. I will use wait_event_timeout instead.
Quoted 11 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
With my comments above, it shouldn't be necessary to loop anymore.
I will remove the lines.
Quoted 10 lines
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
How is this possible?
I will remove the check.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is this really correctly synchronized? If we have 2 users calling this functions at the same time, one would return early assuming that the hardware is "connected" already, but the other one would be still "connecting", which could actually fail.
I will fix it with a mutex hw_op_lock.
Quoted 42 lines
Quoted 42 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +42
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Sending kernel pointers to remote processor?
I will remove it.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is the call above synchronous? If not, don't we need to wait here for SCP to initialize?
No, it is not synchronous when passing 0 in the latest parameter. We would like to improve it by using scp_ipi_send() directly instead of dip_send(), and wait for the ack from SCP with 2ms timeout setting.
ret = scp_ipi_send(dip_hw->scp_pdev SCP_IPI_DIP_INIT,
&frameparam, sizeof(frameparam), 2);
Quoted 12 lines
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Clock should be gated dynamically by the driver when there is no more work to be done and ungated when some new work is queued.
I will gate and ungate the clk when there is no work and new work is queued in the new submit work kthread loop.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This function always returns 0, so it can be just void.
I got it.
Quoted 12 lines
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We shouldn't need to allocate anything here. This "
user_id" has a 1:1 mapping with the subdevice, so we should just store any related data directly in the structure with subdevice data.
I will merge user_id into dip subdevice.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is this really a queue? We just put pipes (subdevs) there in streamon order and they stay there in the same order all the time. It just sounds like a plain list, not a queue.
No, it is not a queue. I would like to correct the naming.
Quoted 26 lines
Quoted 26 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +26
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Similar comment as below. We shouldn't need any look-up like this.
I will also refactor this function.
Quoted 7 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
One normally uses spinlocks for list operations. (I've explained the rule of a thumb in one of my other comments for this or other patch for this or another MTK ISP driver, please check it for details.)
I will use splinlock instead.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Is this counter actually useful? Isn't it redundant with
dip_hw->dip_stream_cnt?
I will also remove queue_cnt.
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
It's a local variable, nobody will reference it anymore after this function returns, so no need to reset it to NULL.
I got it.
Quoted 48 lines
Quoted 48 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +48
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This smells like some unnecessary abstraction. The relation between
mtk_dip_pipeandmtk_dip_hw_user_idseems to be 1:1, so we should just merge both structs and have this function take a pointer to the former. Then we wouldn't need any iteration or error handling here.
I agree with you. I will re-design this part.
Quoted 3 lines
We probably also should have this function fill in the hardware job id in the
img_ipi_frameparamstruct rather than the caller.
I would like to fill the hardware job id in here (mtk_dip_hw_enqueue).
Quoted 12 lines
By the way, I can't find where
img_ipi_frameparamis defined. Is this a struct used to communicate with the firmware?drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We would not need to allocate anything here if we just have this structure already existing as a member of the
mtk_media_requeststruct I mentioned in other comments.
I will put them into mtk_dip_media_request.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
You can just assign it:
framework->frameparams = *frameparams;
I will use this instead.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
It sounds like the struct passed as the frameparams argument to this function and
framework->frameparamsshould be two different structs.
I'm not sure if I understand it. Would you like to elaborate on this point?
I would like to merge mtk_dip_hw_enqueue and mtk_dip_pipe_job_start so that we can configure the framework->frameparams in a single function.
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
What if the work was already running?
It's a bug. I would like to fix it with the kthread solution you described above.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The split of functions between files seems at least strange to me. The platform driver ops deal with initialization of all the media and V4L2 stuff, so I'd put them in them in the same file as all the V4L2/media ops.
I will merge mtk_dip_hw_enqueue() and mtk_dip_pipe_job_start(), and put the merged one in mtk_dip_v4l2.c
Quoted 32 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 28 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +28
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I thought we already solved the larb dependency by using device links, so that drivers don't need to explicitly handle it?
Quoted 2 lines
I got it. We will remove dip_hw->larb_dev.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Clock names should be lowercase. Also, I don't see any point in having the "
DIP_CG_IMG_" prefix in the clock name
I will fix it.
Quoted 18 lines
Quoted 18 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +18
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We can just remove this message.
I will remove it.
Quoted 17 lines
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we need to do something to prevent the driver from scheduling next frames here and wait for the hardware to finish processing current frame here?
I will add some design to handle this case. Could we add a suspend variable in mtk_dip_hw and check it in submit work kthread?
Quoted 8 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we need to kick off the hardware here to continue processing from the next frame?
I will add some design to handle this case.
Quoted 31 lines
Quoted 31 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +31
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The value behind this macro is only used here once. Please just have the string here directly.
I will fix it.
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please use the
of_match_ptr()wrapper.
I will fix it.
Quoted 75 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 71 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +7
-0Lines of this file are not shown. View the raw message.
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +58
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We shouldn't do any hardware operations just at subdev open or close. Those should happen once the streaming actually starts.
Quoted 8 lines
Userspace is expected to open device nodes just to query them and that shouldn't have any side effects.
In general I don't see why we actually should even do anything in subdev ops in this driver. The subdev is only exposed to bridge all the video nodes together and any control is done via either video ioctls or metadata buffers.
I will move the hardware operation to streamon. We call rproc_boot() to load frimware in mtk_dip_hw_connect(), should it be moved to streamon, too?
Quoted 20 lines
Quoted 20 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +20
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We probably wouldn't need this anymore after removing the custom controls.
I will remove it along with buffer_usage ctrl.
Quoted 17 lines
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
How is this synchronized with video node streamon/streamoff ioctls?
We missed this part. I will add a mutex to synchronize the link setup and streamon/ streamoff ops.
Quoted 20 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We need to return an error here if the field is neither ANY or NONE.
Quoted 8 lines
Perhaps we could do something like this:
if (
v4l2_buf->field==V4L2_FIELD_ANY)v4l2_buf->field = V4L2_FIELD_NONE;if (
v4l2_buf->field!=V4L2_FIELD_NONE)return -EINVAL;
I will fix it in the next patch.
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Do we really need to set the field in all the 3 functions here? The natural flow would be to set it in
buf_out_validatefor OUTPUT buffers and before callingvb2_buffer_done()for CAPTURE buffers.
Quoted 3 lines
Then we wouldn't even need to implement the .buf_prepare or .buf_queue callbacks.
I will to keep buf_out_validate only.
Quoted 9 lines
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This comment doesn't add any additional information than visible from the code itself.
I will remove the comment.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This should be already clamped to [1,
VB2_MAX_FRAME].
I will remove this line.
Quoted 12 lines
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This function shouldn't need to assign alloc_decs[] at all. You can just set
vb2_queue::devto the right struct device pointer at driver initialization and the core would use that.
I got it. I will set vb2_queue::dev at driver initialization.
Quoted 18 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I don't think this is an error. This is for handling
VIDIOC_CREATE_BUFS, which can allocate for any arbitrary format.
Quoted 3 lines
Whether the size of the buffer is big enough for current format should be checked in .buf_prepare callback.
I will remove the error return here and move the size check to .buf_prepare().
Quoted 21 lines
Quoted 21 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +21
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
How is this synchronized? What happens if another thread stops streaming of the node at the same time?
I would like to add a mutex to synchronize the streamon/ streamoff ops.
Quoted 3 lines
I think we could do smarter here, for example, by maintaing a counter of nodes not streaming yet.
I got it. I will improve the function with a counter.
Quoted 12 lines
Quoted 12 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We can't just access
vb2_queueinternals like this. The driver should hold any queued buffers in its own list and iterate over the list here.
I will fix it.
Quoted 13 lines
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This should be
-ENOLINK.
I will fix it.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
A general hint: Please don't add blank lines between the assignments and then conditional blocks on the variable being assigned. Both are closely related and so shouldn't be separated.
I will fix it.
Quoted 2 lines
Also, do we need to do it for every node? I think we could just move this just before the
v4l2_subdev_call()below.
I will move this before v4l2_subdev_call().
Quoted 42 lines
Quoted 42 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +41
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
I will fix it.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Something wrong with intentation here.
I will fix it.
Quoted 7 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We're probably not expecting any controls in this driver.
I will remove this line.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Do we really need a function for this simple dereference?
I will remove the function and use node->desc->cap instead.
Quoted 27 lines
Quoted 27 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +27
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Name of the function is confusing, as it suggests that format is actually set. Also, that function is not very long and only called once, here. Please just move its contents here.
I will remove the function and move it contents here.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is not a very good behavior. Ideally the driver should adjust the format to the closest supported one, not default. At least the fields that are acceptable should stay as is and just those that are unsupported should be adjusted.
I will re-design the function to adjust unsupported parts only.
Quoted 16 lines
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
I will remove the line.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
I will remove the line.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
If
mtk_dip_videoc_try_fmt()returns an error, we should return an error here too.
I will fix it.
Quoted 31 lines
Quoted 31 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +31
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Could we have 2 predefined
v4l2_framesizeenumstructs and pointers to them inmtk_dip_video_device_descstructs and just copy the contents here? That would eliminate the conditional handling.
Yes, I will add the design.
Quoted 4 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Not >=?
I will fix it.
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The second part of the condition should be already handled by the core.
I will remove it.
Quoted 11 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The second part of the condition should be already handled by the core.
I will remove the second part.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Also flags to 0.
I will set f->flag to 0.
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +15
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We can just use this helper directly as the callback, without the need to implement it here.
I got it. I will use v4l2_ctrl_subscribe_event as the callback directly.
Quoted 29 lines
Quoted 29 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +29
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This seems to be always called with
all_enable_node_need_buf== 0. Please remove the unused argument and dead code paths.
I will remove the nused argument and dead code paths.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
No need for the
dip_prefix in the variables if there is no collision.
I will rename the variables.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Don't we still need to validate whether all the buffers in the request belong to the same pipe?
I would like to add the required buffer check and pipe check here.
Quoted 2 lines
Also double space after return.
I will fix it.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
If we're only interested in buffers, we can invert the condition and use the continue keyword to reduce the indentation level.
I got it.
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
count is not changed in this loop. How is it possible for this condition to be false?
Anyway, we can do it without a counter:
struct
mtk_dip_pipe*pipe,*pipe_prev= NULL;
//...
Quoted 9 lines
list_for_each_entry(...) {
// ...
pipe = vb2_get_drv_priv(,,,);
if (pipe_prev && pipe != pipe_prev) {
// error
}
pipe_prev = pipe;
}I got it.
Quoted 9 lines
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Can we get a buffer that isn't associated to any pipe? If not, doesn't that mean that there was no buffer in the request? In such case, probably the debug message should say that there was no buffers instead.
No, we can't. I will update the debug message.
Quoted 9 lines
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
We shouldn't need to handle the enabled status anymore, since with requests we decide what's enabled based on what buffers are in the request.
I will remove the node enabling check.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why not just have this code inside
mtk_dip_vb2_request_validate()?
I will move this codes into mtk_dip_vb2_request_validate().
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is problematic, because
vb2_request_queue()doesn't necessarily hand the buffers over to the driver. For example, you can still queue some requests before starting streaming on the queues and thenvb2_request_queue()would keep those buffers owned by the vb2 framework until streaming is started.
Quoted 16 lines
I'd suggest a following redesign:
- do any driver-specific job data preparation inmtk_dip_vb2_request_validate()and store it inside themtk_dip_requeststruct (superclass of structmedia_requestthat I mentioned in another comment),
- have a driver-internal queue of requests,
- have a counter field inmtk_dip_requestthat would track the number of remaining buffers that still need to be handed over to the driver by the vb2,
- in .buf_queue() dereference the request attached to the buffer and decrement the above counter,
- have a function likemtk_dip_pipe_try_enqueue()that checks if the hardware is streaming and if so, tries to schedule as many requests from the top of the request queue as long as they are ready (buffer counter is 0).
I would like to re-design the enqueue flow following your suggestion in V2.
Quoted 36 lines
Quoted 36 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why not just have
mtk_dip_node_get_v4l2_cap()includeV4L2_CAP_STREAMINGin the return value?
I would like to set the V4L2_CAP_STREAMING in node->desc->cap directly.
vdev->device_caps = node->desc->caps;
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 1 line
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
mtk_dip_pipe_load_default_fmt()initializes this field.
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Once we remove the 2 lines mentioned above, this function becomes really small and it's only used in one place, in
mtk_dip_pipe_v4l2_register(). There is no need to have this in a function, just put the code directly where it's called.
I will remove the function.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Unnecessary variable initialization.
I will fix it.
Quoted 18 lines
Quoted 18 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +18
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Why all those debugging messages? There isn't anything special happening above, so I don't see a point in having those. Please remove.
I will remove them.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Use
dev_dbg().
I will fix it.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
I will remove the line.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Add a blank line.
I will fix it.
Quoted 17 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please avoid unnecessary variable initialization.
Quoted 2 lines
nit: Variable declarations should be separated with a blank line.
I will fix it.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
The two debugging messages above are not useful, please remove them.
I will remove them.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please use
dev_dbg(). Also no need for line wrapping here.
I will fix it.
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Unnecessary blank line.
I will fix it.
Quoted 23 lines
Quoted 23 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +23
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
I think we could just use
devm_kcalloc()here and remove any matching calls tokfree(), since that would be cleaned up for us when removing the driver.
I will use devm_kcalloc() instead.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
There is nothing to clean up here, we can just return directly.
A hint for avoiding this kind of mistakes: Always name the label after the first thing that needs to be cleaned up after jumping to it. In this case you wouldn't have a name for it! :)
I will remove the incorrect cleanup.
Quoted 30 lines
Quoted 30 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +30
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Please group all the direct assignment to
dip_pipe->subdevfields, for better code readabiltiy.
I will fix it.
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
nit: Add a blank line here.
I will fix it.
Quoted 13 lines
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
3 lines not shown · raw message
681 lines not shown · raw message
Parts of this message are not shown here. View the raw message.
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Hi Frederic,
Quoted 4 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
You're welcome. Thanks for replying to all the comments. I'll skip those resolved in my reply to keep the message shorter.
Quoted 5 lines · Tomasz Figa
Quoted 3 lines
Hi Frederic,
On Wed, Apr 17, 2019 at 7:45 PM Frederic Chen <[email protected]> wrote:
[snip]
Quoted 21 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 311
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + timestamp =ktime_get_ns ();This timestamp is unused.
This line will be removed in the next patch.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 318
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +struct mtk_dip_dev_buffer *dev_buf = job_info->buf_map[i]; + +if (!dev_buf) { +continue ; + }else {No need to put this code under else.
I got it.
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
+
dev_buf->vbb.vb2_buf.timestamp=ktime_get_ns();Did you mean to use the timestamp variable here?
I would like to remove timestamp and still use
dev_buf->vbb.vb2_buf.timestampdirectly.
That would result in buffers from different queues having different timestamps.
However, this is a mem2mem device, so we shouldn't assign timestamps here. We should copy the timestamp from the matching input buffer. I missed that before, sorry.
[snip]
Quoted 13 lines
Quoted 4 lines
Quoted 2 lines
+
dev_buf->buffer_usage=node->dev_q.buffer_usage;There should be no
buffer_usage, but rather separate queue for each usage.I will remove mtk_dip_dev_buffer.buffer_usage and
mtk_dip_dev_queue.buffer_usage.May I add the dma port information (DMA port selection hint) in each video node's setting (
mtk_dip_video_device_desc) so that we can retrieve the hint when we need to pass the buffer to co-processor as following:
Quoted 13 lines
static int fill_ipi_img_param(struct
mtk_dip_pipe*dip_pipe,
structimg_image_buffer*img, structmtk_dip_dev_buffer*dev_buf, char*buf_name)
{
structmtk_dip_video_device*vdo_dev;
// ...vdo_dev=mtk_dip_vbq_to_node(dev_buf->vbb.vb2_buf.vb2_queue); /* image parameter will be passed to firmware*/img->usage=vdo_dev->desc->dma_hint;
// ...
}
Yes, that sounds sensible, but I'm not sure "hint" is a good name here, because the purpose is precisely defined, not just a hint. Perhaps better to call it something like "dma_port"?
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ dev_buf->rotation = node->dev_q.rotation; + +if (desc->smem_alloc) { + dev_buf->scp_daddr = +mtk_dip_smem_iova_to_phys + (dip_pipe->smem_alloc_dev, + dev_buf->isp_daddr);
Quoted 7 lines
Quoted 1 line
Isn't this overly wrapped? The first argument should fit in the second line.
Do you mean the modification like this:
dev_buf->scp_daddr = mtk_dip_smem_iova_to_phys (dip_pipe->smem_alloc_dev, dev_buf->isp_daddr);
Almost. The wrapped lines should be aligned to the right as much as possible, so it would be more like:
dev_buf->scp_daddr = mtk_dip_smem_iova_to_phys( dip_pipe->smem_alloc_dev, dev_buf->isp_daddr);
[snip]
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ +if (fjob->sequence ==-1 ) { +pr_err ("%s: Invalid cmdq_cb_data(%p)\n" , + __func__, data); + ipi_fparam =NULL ;
Quoted 8 lines
Quoted 4 lines
As far as I can see, we always get the data we explicitly gave to the cmdq driver together with the callback function, so it sounds like we shouldn't be able to get invalid data here.
I'm not sure if we can always trust CMDQ callback since we had suffered from an CMDQ bug that return an invalid address before.
Hmm, but these values don't really go to the CMDQ hardware or firmware, right? It's just the kernel CMDQ driver that looks the data pointer in its internal state. That would be a bug similar to the workqueue framework giving a bad pointer to the work function.
Also, checking for -1 alone doesn't really help us too much, because we could for example get a pointer to some memory filled with random values, in case of such bug.
Perhaps we should inspect the CMDQ driver design instead to make sure it's impossible to receive a bad pointer from it.
[snip]
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (WARN_ONCE (!mdpcb_work,"%s: frame_no(%d) is lost" , + __func__, frameparam->frame_no)) +return ; + +INIT_WORK (&mdpcb_work->frame_work, mdp_cb_worker); + mdpcb_work->frameparams = frameparam; +if (data.sta !=CMDQ_CB_NORMAL )Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 354
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ mdpcb_work->frameparams->state =FRAME_STATE_HW_TIMEOUT ; + +queue_work (dip_hw->mdpcb_workqueue, &mdpcb_work->frame_work);Looking at
mdp_cb_worker()andmtk_dip_notify()called by it, after fixing the locking to use spinlocks rather than mutexes and remove some dynamic allocations pointed out in other comments, we could just run them in atomic context, without the need for this workqueue.
Quoted 9 lines
I will re-design this part to support the function to be run in atomic context.
I would like to discuss the error handling in this function for the next patch. When we get
FRAME_STATE_HW_TIMEOUT, is it suitable to trigger a work to notify SCP withscp_ipi_send()to dump debug messages in further? (Can this kind of debugging function be upstream?)
Yes, we should be able to have something like that.
Quoted 29 lines
Quoted 18 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+} + +static void dip_vpu_handler (void *data,unsigned int len,void *priv) +{ +struct img_frameparam *framejob; +struct img_ipi_frameparam *frameparam;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 370
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +unsigned long flags; +u32 num; + +if (WARN_ONCE (!data,"%s: failed due to NULL data\n" , __func__)) +return ; + + frameparam = (struct img_ipi_frameparam *)data; + framejob =dip_create_framejob (frameparam->index);Quoted 7 lines
Rather than creating this dynamically, it should be already created. The reason you have the priv argument to this function is that you can have the SCP driver give to you a pointer to some struct that you gave to it when calling
scp_ipi_register(). That struct should have a list of valid VPU jobs and here you should iterate through that list and find a matching job or fail if there is no matching one. (We need to validate here, because we can't trust the values coming from the firmware.)May I embedded
img_frameparaminto the extendedmedia_requestobject so that it can be managed withmedia_requestobjects?
Quoted 9 lines
struct mtk_dip_request {
struct media_request request;
struct mtk_dip_pipe_job_info job_info;
struct mtk_dip_hw_work dip_work;
struct img_frameparam job;
struct mtk_dip_hw_mdpcb_timeout_work timeout_work;
};Yes, I think it would make sense indeed.
[snip]
Quoted 53 lines
Quoted 28 lines
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +14
-0+static int dip_runner_func (void *data) +{ +struct img_frameparam *framejob; +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_user_id *user_id; +unsigned long flags; +bool found; +u32 queuecnt, num; +int ret; + + dip_hw = (struct mtk_dip_hw *)data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 418
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+while (1 ) { +spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, flags); + queuecnt = dip_hw->dip_gcejoblist.queue_cnt; +spin_unlock_irqrestore (&dip_hw->dip_gcejoblist.queuelock, + flags); + + ret =wait_event_interruptible_timeout + (dip_hw->dip_runner_thread.wq, + queuecnt ||kthread_should_stop (), +msecs_to_jiffies (DIP_COMPOSER_THREAD_TIMEOUT ));Checking queuecnt here is also wrong. Please check my comment to another wait_event_* in this patch.
Quoted 6 lines
Also the interruptibility and timeout don't make sense here, because we just want to keep waiting unless something shows up or the kthread is forcefully woken up for stopping.
However, we probably want it to be
freezable(), so that we don't have to bring the thread down and up on suspend/resume.I would like to fix it as following:
static bool
mtk_dip_hw_qce_queuecnt(struct mtk_dip_hw *dip_hw){ int queuecnt; spin_lock_irqsave(&dip_hw->dip_gcejoblist.queuelock, flags); queuecnt = dip_hw->dip_gcejoblist.queue_cnt; spin_unlock_irqrestore(&dip_hw->dip_gcejoblist.queuelock, return queuecnt; }static int
dip_runner_func(void *data)
{
Quoted 16 lines
//...
set_freezable();
while(1) {
wait_event_freezable((dip_hw->dip_runner_thread.wq,
mtk_dip_hw_qce_queuecnt() ||
kthread_should_stop());
if (kthread_should_stop())
break;
// Call MDP/GCE API to do HW excecution
// ...
}
}Sounds good to me.
[snip]
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ +free_work_list: + + dev_dbg(&dip_dev->pdev->dev, + "%s, free: frame_no(%d),idx(0x%x),worklist cnt(%d),composing num(%d)\n",Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 661
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ __func__, dip_work->frameparams.frame_no, + dip_work->frameparams.index, len, num); + +kfree (dip_work);We haven't allocated this object and so we shouldn't free it here. The layer that allocated it should receive it back and free. (But we probably don't need to allocate it dynamically as per my other comments.)
May I also merge
dip_workintomtk_dip_request?
Quoted 8 lines
struct mtk_dip_request {
struct media_request request;
struct mtk_dip_pipe_job_info job_info;
struct mtk_dip_hw_work dip_work;
struct img_frameparam job;
struct mtk_dip_hw_mdpcb_timeout_work timeout_work;
};Yes, it should indeed make sense.
Quoted 17 lines
Quoted 17 lines
Also a general note - a work can be queued only once. This means that current code races when two
dip_worksare attempted to be queued very quickly one after another (or even at the same time from different threads).I can think of two potential options for fixing this:
1) Loop in the work function until there is nothing to queue to the hardware anymore - but this needs tricky synchronization, because there is still short time at the end of the work function when a new
dip_workcould be added.2) Change this to a kthread that just keeps running in a loop waiting for some available
dip_workto show up and then sending it to the firmware. This should be simpler, as the kthread shouldn't have a chance to miss anydip_workqueued.
Quoted 5 lines
Quoted 3 lines
I'm personally in favor of option 2, as it should simplify the synchronization.
I would like to re-design this part with a kthread in the next patch.
Actually I missed another option. We could have 1 work_struct for 1 request and then we could keep using a workqueue. Perhaps that could be simpler than a kthread.
Actually, similar approach could be used for the dip_runner_func. Instead of having a kthread looping, we could just have another workqueue and 1 dip_runner_work per 1 request. Then we wouldn't need to do the waiting loop ourselves anymore.
Does it make sense?
[snip]
Quoted 29 lines
Quoted 19 lines
Quoted 19 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +19
-0+ buf->buffer.iova =sg_dma_address (buf->table.sgl); + buf->tuning_buf.iova = buf->buffer.iova + +DIP_TUNING_OFFSET ; + +dev_dbg (&dip_dev->pdev->dev, +"%s: buf(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->buffer.pa, buf->buffer.iova); + +dev_dbg (&dip_dev->pdev->dev, +"%s: config_data(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->config_data.pa, buf->config_data.va); + +dev_dbg (&dip_dev->pdev->dev, +"%s: tuning_buf(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->tuning_buf.pa, buf->tuning_buf.iova); + +dev_dbg (&dip_dev->pdev->dev, +"%s: frameparam(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->frameparam.pa, buf->frameparam.va);Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 848
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+ +list_add_tail (&buf->list_entry, + &dip_hw->dip_freebufferlist.queue); + dip_hw->dip_freebufferlist.queue_cnt++; +kfree (pages); + }But actually, why aren't these buffers managed by VB2?
Quoted 8 lines
I would like to manage the buffer with VB2, but I'm not sure what is the right way to do that.
These are DIP internal working buffers. The buffers are not read or written by user application. In this case, could I add a meta capture video device to manage them or integrate the buffers with tuning meta output buffer directly?
Ah, if these are internal buffers, then I guess we indeed need to allocate them ourselves.
[snip]
Quoted 8 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1075
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ frameparam.state =FRAME_STATE_INIT ; +dip_send (dip_hw->vpu_pdev,SCP_IPI_DIP_INIT , + (void *)&frameparam,sizeof (frameparam),0 );Is the call above synchronous? If not, don't we need to wait here for SCP to initialize?
Quoted 7 lines
No, it is not synchronous when passing 0 in the latest parameter. We would like to improve it by using
scp_ipi_send()directly instead ofdip_send(), and wait for the ack from SCP with 2ms timeout setting.ret = scp_ipi_send(dip_hw->scp_pdev
SCP_IPI_DIP_INIT,&frameparam, sizeof(frameparam), 2);
2ms could likely fail here quite often, because even kernel code can be preempted. We should have something like 200ms here, just to avoid blocking indefinitely, but long enough not to happen even during high system load.
[snip]
Quoted 9 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1233
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ framework->frameparams.state =FRAME_STATE_INIT ; + framework->frameparams.frame_no = +atomic_inc_return (&dip_hw->dip_enque_cnt);It sounds like the struct passed as the frameparams argument to this function and
framework->frameparamsshould be two different structs.
Quoted 6 lines
I'm not sure if I understand it. Would you like to elaborate on this point?
I would like to merge
mtk_dip_hw_enqueueandmtk_dip_pipe_job_startso that we can configure theframework->frameparamsin a single function.
Ah, that comment might have been added before I noticed that the functions can be merged. Forgot to remove, sorry. Please ignore.
[snip]
Quoted 15 lines
Quoted 5 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+static int __maybe_unused mtk_dip_pm_suspend (struct device *dev) +{ +struct mtk_dip_dev *dip_dev =dev_get_drvdata (dev); + +if (atomic_read (&dip_dev->dip_hw.dip_user_cnt) >0 ) {Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1326
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+mtk_dip_hw_set_clk (&dip_dev->dip_hw, false); +dev_dbg (&dip_dev->pdev->dev,"%s: disable clock\n" , + __func__); + }Don't we need to do something to prevent the driver from scheduling next frames here and wait for the hardware to finish processing current frame here?
Quoted 3 lines
I will add some design to handle this case. Could we add a suspend variable in
mtk_dip_hwand check it in submit work kthread?
Actually, with the other changes, the kthread would have been frozen for us at this point, so maybe there isn't anything to do here! :)
OR, if we change the kthread to a workqueue (as per my other comment above), we could make the workqueue freezable (by adding WQ_FREEZABLE to the flags argument at creation time) and it would be frozen for us after finishing current work struct.
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +return 0 ; +} + +static int __maybe_unused mtk_dip_pm_resume (struct device *dev) +{ +struct mtk_dip_dev *dip_dev =dev_get_drvdata (dev); +Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1339
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+if (atomic_read (&dip_dev->dip_hw.dip_user_cnt) >0 ) { +mtk_dip_hw_set_clk (&dip_dev->dip_hw, true); +dev_dbg (&dip_dev->pdev->dev,"%s: enable clock\n" , + __func__); + }Don't we need to kick off the hardware here to continue processing from the next frame?
Quoted 2 lines
I will add some design to handle this case.
As per above, making the kthreads/workqueues freezable actually should solve the problem.
[snip]
Quoted 27 lines
Quoted 18 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0+static int mtk_dip_subdev_close (struct v4l2_subdev *sd, +struct v4l2_subdev_fh *fh) +{ +struct mtk_dip_pipe *dip_pipe =mtk_dip_subdev_to_pipe (sd);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 58
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0+struct mtk_dip_dev *dip_dev = +dev_get_drvdata (&dip_pipe->dip_dev->pdev->dev); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: pipe(%d) disconnect to dip_hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); + +return mtk_dip_hw_disconnect (&dip_dev->dip_hw); +}We shouldn't do any hardware operations just at subdev open or close. Those should happen once the streaming actually starts.
Quoted 8 lines
Userspace is expected to open device nodes just to query them and that shouldn't have any side effects.
In general I don't see why we actually should even do anything in subdev ops in this driver. The subdev is only exposed to bridge all the video nodes together and any control is done via either video ioctls or metadata buffers.
Quoted 4 lines
I will move the hardware operation to streamon. We call
rproc_boot()to load frimware inmtk_dip_hw_connect(), should it be moved to streamon, too?
I think that would normally be done in runtime PM callbacks, with autosuspend delay enabled to avoid continuous power-off and on repeateadly.
Then, when there is a request to queue, the driver would call pm_runtime_get_sync() and when a request completes, pm_runtime_put_autosuspend().
[snip]
Quoted 16 lines
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0+static void mtk_dip_node_to_v4l2 (struct mtk_dip_pipe *dip_pipe, +u32 idx, +struct video_device *vdev, +struct v4l2_format *f) +{ +u32 cap;Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 616
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0+struct mtk_dip_video_device *node = &dip_pipe->nodes[idx]; + + cap =mtk_dip_node_get_v4l2_cap (dip_pipe, node); + vdev->ioctl_ops = node->desc->ops; + vdev->device_caps =V4L2_CAP_STREAMING | cap;Why not just have
mtk_dip_node_get_v4l2_cap()includeV4L2_CAP_STREAMINGin the return value?
Quoted 4 lines
I would like to set the
V4L2_CAP_STREAMINGinnode->desc->capdirectly.
vdev->device_caps=node->desc->caps;
Sure, that's also good.
Best regards,
Tomasz
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Dear Tomasz,
Thank you for your comments.
Quoted 46 lines · Tomasz Figa
Hi Frederic,
Quoted 4 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
You're welcome. Thanks for replying to all the comments. I'll skip those resolved in my reply to keep the message shorter.
Quoted 5 lines · Tomasz Figa
Quoted 3 lines
Hi Frederic,
On Wed, Apr 17, 2019 at 7:45 PM Frederic Chen <[email protected]> wrote:
[snip]
Quoted 21 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 311
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +2
-0+ + timestamp =ktime_get_ns ();This timestamp is unused.
This line will be removed in the next patch.
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 318
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ +for (i =0 ; i <MTK_DIP_VIDEO_NODE_ID_TOTAL_NUM ; i++) { +struct mtk_dip_dev_buffer *dev_buf = job_info->buf_map[i]; + +if (!dev_buf) { +continue ; + }else {No need to put this code under else.
I got it.
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
+
dev_buf->vbb.vb2_buf.timestamp=ktime_get_ns();Did you mean to use the timestamp variable here?
I would like to remove timestamp and still use
dev_buf->vbb.vb2_buf.timestampdirectly.
Quoted 6 lines
That would result in buffers from different queues having different timestamps.
However, this is a mem2mem device, so we shouldn't assign timestamps here. We should copy the timestamp from the matching input buffer. I missed that before, sorry.
I will copy the raw input buffer's timestamps to the mdp 0 and mdp 1 buffer's ones.
Quoted 30 lines
[snip]
Quoted 13 lines
Quoted 4 lines
Quoted 2 lines
+
dev_buf->buffer_usage=node->dev_q.buffer_usage;There should be no
buffer_usage, but rather separate queue for each usage.I will remove mtk_dip_dev_buffer.buffer_usage and
mtk_dip_dev_queue.buffer_usage.May I add the dma port information (DMA port selection hint) in each video node's setting (
mtk_dip_video_device_desc) so that we can retrieve the hint when we need to pass the buffer to co-processor as following:Quoted 13 lines
static int fill_ipi_img_param(struct
mtk_dip_pipe*dip_pipe,
structimg_image_buffer*img, structmtk_dip_dev_buffer*dev_buf, char*buf_name)
{
structmtk_dip_video_device*vdo_dev;
// ...vdo_dev=mtk_dip_vbq_to_node(dev_buf->vbb.vb2_buf.vb2_queue); /* image parameter will be passed to firmware*/img->usage=vdo_dev->desc->dma_hint;
// ...
}
Quoted 4 lines
Yes, that sounds sensible, but I'm not sure "hint" is a good name here, because the purpose is precisely defined, not just a hint. Perhaps better to call it something like "
dma_port"?
Yes, I would like to use "dma_port" since it is better.
Quoted 18 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+ dev_buf->rotation = node->dev_q.rotation; + +if (desc->smem_alloc) { + dev_buf->scp_daddr = +mtk_dip_smem_iova_to_phys + (dip_pipe->smem_alloc_dev, + dev_buf->isp_daddr);Quoted 7 lines
Quoted 1 line
Isn't this overly wrapped? The first argument should fit in the second line.
Do you mean the modification like this:
dev_buf->scp_daddr = mtk_dip_smem_iova_to_phys (dip_pipe->smem_alloc_dev, dev_buf->isp_daddr);
Quoted 7 lines
Almost. The wrapped lines should be aligned to the right as much as possible, so it would be more like:
dev_buf->scp_daddr = mtk_dip_smem_iova_to_phys( dip_pipe->smem_alloc_dev, dev_buf->isp_daddr);
I got it.
Quoted 21 lines
[snip]
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ +if (fjob->sequence ==-1 ) { +pr_err ("%s: Invalid cmdq_cb_data(%p)\n" , + __func__, data); + ipi_fparam =NULL ;Quoted 8 lines
Quoted 4 lines
As far as I can see, we always get the data we explicitly gave to the cmdq driver together with the callback function, so it sounds like we shouldn't be able to get invalid data here.
I'm not sure if we can always trust CMDQ callback since we had suffered from an CMDQ bug that return an invalid address before.
Hmm, but these values don't really go to the CMDQ hardware or firmware, right? It's just the kernel CMDQ driver that looks the data pointer in its internal state. That would be a bug similar to the workqueue framework giving a bad pointer to the work function.
Quoted 7 lines
Also, checking for -1 alone doesn't really help us too much, because we could for example get a pointer to some memory filled with random values, in case of such bug.
Perhaps we should inspect the CMDQ driver design instead to make sure it's impossible to receive a bad pointer from it.
I agree with you. I will remove the fjob->sequence check codes.
Quoted 203 lines
[snip]
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (WARN_ONCE (!mdpcb_work,"%s: frame_no(%d) is lost" , + __func__, frameparam->frame_no)) +return ; + +INIT_WORK (&mdpcb_work->frame_work, mdp_cb_worker); + mdpcb_work->frameparams = frameparam; +if (data.sta !=CMDQ_CB_NORMAL )Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 354
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ mdpcb_work->frameparams->state =FRAME_STATE_HW_TIMEOUT ; + +queue_work (dip_hw->mdpcb_workqueue, &mdpcb_work->frame_work);Looking at
mdp_cb_worker()andmtk_dip_notify()called by it, after fixing the locking to use spinlocks rather than mutexes and remove some dynamic allocations pointed out in other comments, we could just run them in atomic context, without the need for this workqueue.Quoted 9 lines
I will re-design this part to support the function to be run in atomic context.
I would like to discuss the error handling in this function for the next patch. When we get
FRAME_STATE_HW_TIMEOUT, is it suitable to trigger a work to notify SCP withscp_ipi_send()to dump debug messages in further? (Can this kind of debugging function be upstream?)Yes, we should be able to have something like that.
Quoted 29 lines
Quoted 18 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+} + +static void dip_vpu_handler (void *data,unsigned int len,void *priv) +{ +struct img_frameparam *framejob; +struct img_ipi_frameparam *frameparam;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 370
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +unsigned long flags; +u32 num; + +if (WARN_ONCE (!data,"%s: failed due to NULL data\n" , __func__)) +return ; + + frameparam = (struct img_ipi_frameparam *)data; + framejob =dip_create_framejob (frameparam->index);Quoted 7 lines
Rather than creating this dynamically, it should be already created. The reason you have the priv argument to this function is that you can have the SCP driver give to you a pointer to some struct that you gave to it when calling
scp_ipi_register(). That struct should have a list of valid VPU jobs and here you should iterate through that list and find a matching job or fail if there is no matching one. (We need to validate here, because we can't trust the values coming from the firmware.)May I embedded
img_frameparaminto the extendedmedia_requestobject so that it can be managed withmedia_requestobjects?Quoted 9 lines
struct mtk_dip_request { struct media_request request; struct mtk_dip_pipe_job_info job_info; struct mtk_dip_hw_work dip_work; struct img_frameparam job; struct mtk_dip_hw_mdpcb_timeout_work timeout_work; };Yes, I think it would make sense indeed.
[snip]
Quoted 53 lines
Quoted 28 lines
Quoted 14 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +14
-0+static int dip_runner_func (void *data) +{ +struct img_frameparam *framejob; +struct mtk_dip_hw *dip_hw; +struct mtk_dip_dev *dip_dev; +struct mtk_dip_hw_user_id *user_id; +unsigned long flags; +bool found; +u32 queuecnt, num; +int ret; + + dip_hw = (struct mtk_dip_hw *)data; + dip_dev =mtk_dip_hw_to_dev (dip_hw); +drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 418
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +10
-0+while (1 ) { +spin_lock_irqsave (&dip_hw->dip_gcejoblist.queuelock, flags); + queuecnt = dip_hw->dip_gcejoblist.queue_cnt; +spin_unlock_irqrestore (&dip_hw->dip_gcejoblist.queuelock, + flags); + + ret =wait_event_interruptible_timeout + (dip_hw->dip_runner_thread.wq, + queuecnt ||kthread_should_stop (), +msecs_to_jiffies (DIP_COMPOSER_THREAD_TIMEOUT ));Checking queuecnt here is also wrong. Please check my comment to another wait_event_* in this patch.
Quoted 6 lines
Also the interruptibility and timeout don't make sense here, because we just want to keep waiting unless something shows up or the kthread is forcefully woken up for stopping.
However, we probably want it to be
freezable(), so that we don't have to bring the thread down and up on suspend/resume.I would like to fix it as following:
static bool
mtk_dip_hw_qce_queuecnt(struct mtk_dip_hw *dip_hw){ int queuecnt; spin_lock_irqsave(&dip_hw->dip_gcejoblist.queuelock, flags); queuecnt = dip_hw->dip_gcejoblist.queue_cnt; spin_unlock_irqrestore(&dip_hw->dip_gcejoblist.queuelock, return queuecnt; }static int
dip_runner_func(void *data)
{Quoted 16 lines
//... set_freezable(); while(1) { wait_event_freezable((dip_hw->dip_runner_thread.wq, mtk_dip_hw_qce_queuecnt() || kthread_should_stop()); if (kthread_should_stop()) break; // Call MDP/GCE API to do HW excecution // ... } }Sounds good to me.
[snip]
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+ +free_work_list: + + dev_dbg(&dip_dev->pdev->dev, + "%s, free: frame_no(%d),idx(0x%x),worklist cnt(%d),composing num(%d)\n",Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 661
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ __func__, dip_work->frameparams.frame_no, + dip_work->frameparams.index, len, num); + +kfree (dip_work);We haven't allocated this object and so we shouldn't free it here. The layer that allocated it should receive it back and free. (But we probably don't need to allocate it dynamically as per my other comments.)
May I also merge
dip_workintomtk_dip_request?Quoted 8 lines
struct mtk_dip_request { struct media_request request; struct mtk_dip_pipe_job_info job_info; struct mtk_dip_hw_work dip_work; struct img_frameparam job; struct mtk_dip_hw_mdpcb_timeout_work timeout_work; };Yes, it should indeed make sense.
Quoted 17 lines
Quoted 17 lines
Also a general note - a work can be queued only once. This means that current code races when two
dip_worksare attempted to be queued very quickly one after another (or even at the same time from different threads).I can think of two potential options for fixing this:
1) Loop in the work function until there is nothing to queue to the hardware anymore - but this needs tricky synchronization, because there is still short time at the end of the work function when a new
dip_workcould be added.2) Change this to a kthread that just keeps running in a loop waiting for some available
dip_workto show up and then sending it to the firmware. This should be simpler, as the kthread shouldn't have a chance to miss anydip_workqueued.Quoted 5 lines
Quoted 3 lines
I'm personally in favor of option 2, as it should simplify the synchronization.
I would like to re-design this part with a kthread in the next patch.
Actually I missed another option. We could have 1
work_structfor 1 request and then we could keep using a workqueue. Perhaps that could be simpler than a kthread.
Quoted 6 lines
Actually, similar approach could be used for the
dip_runner_func. Instead of having a kthread looping, we could just have another workqueue and 1dip_runner_workper 1 request. Then we wouldn't need to do the waiting loop ourselves anymore.Does it make sense?
Yes, it make sense. Let me summarize the modification about the flow.
First, we will have two work_struct in mtk_dip_request.
struct mtk_dip_request {
struct media_request request;
//...
/* Prepare DIP part hardware configurtion */
struct mtk_dip_hw_submit_work submit_work;
/* Replace dip_running thread jobs*/
struct mtk_dip_hw_composing_work composing_work;
/* Only for composing error handling */
struct mtk_dip_hw_mdpcb_timeout_work timeout_work;
};Second, the overall flow of handling each request is :
1. mtk_dip_hw_enqueue calls queue_work() to put submit_work into its workqueue
2. submit_work sends IMG_IPI_FRAME command to SCP to prepare DIP hardware configuration
3. dip_scp_handler receives the IMG_IPI_FRAME result from SCP
4. dip_scp_handler calls queue_work() to put composing_work (instead of original dip_running thread jobs) into its workqueue
5. composing_work calls dip_mdp_cmdq_send() to finish the mdp part tasks
6. dip_mdp_cb_func() trigged by MDP driver calls vb2_buffer_done to return the buffer (no workqueue required here)
Quoted 35 lines
[snip]
Quoted 32 lines
Quoted 19 lines
Quoted 19 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +19
-0+ buf->buffer.iova =sg_dma_address (buf->table.sgl); + buf->tuning_buf.iova = buf->buffer.iova + +DIP_TUNING_OFFSET ; + +dev_dbg (&dip_dev->pdev->dev, +"%s: buf(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->buffer.pa, buf->buffer.iova); + +dev_dbg (&dip_dev->pdev->dev, +"%s: config_data(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->config_data.pa, buf->config_data.va); + +dev_dbg (&dip_dev->pdev->dev, +"%s: tuning_buf(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->tuning_buf.pa, buf->tuning_buf.iova); + +dev_dbg (&dip_dev->pdev->dev, +"%s: frameparam(%d), pa(%p), iova(%p)\n" , + __func__, i, buf->frameparam.pa, buf->frameparam.va);Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 848
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+ +list_add_tail (&buf->list_entry, + &dip_hw->dip_freebufferlist.queue); + dip_hw->dip_freebufferlist.queue_cnt++; +kfree (pages); + }But actually, why aren't these buffers managed by VB2?
I would like to manage the buffer with VB2, but I'm not sure what is the right way to do that.
Quoted 8 lines
Quoted 5 lines
These are DIP internal working buffers. The buffers are not read or written by user application. In this case, could I add a meta capture video device to manage them or integrate the buffers with tuning meta output buffer directly?
Ah, if these are internal buffers, then I guess we indeed need to allocate them ourselves.
I got it.
Quoted 15 lines
[snip]
Quoted 12 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1075
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ frameparam.state =FRAME_STATE_INIT ; +dip_send (dip_hw->vpu_pdev,SCP_IPI_DIP_INIT , + (void *)&frameparam,sizeof (frameparam),0 );Is the call above synchronous? If not, don't we need to wait here for SCP to initialize?
No, it is not synchronous when passing 0 in the latest parameter. We would like to improve it by using
scp_ipi_send()directly instead ofdip_send(), and wait for the ack from SCP with 2ms timeout setting.
Quoted 9 lines
Quoted 3 lines
ret = scp_ipi_send(dip_hw->scp_pdev
SCP_IPI_DIP_INIT,&frameparam, sizeof(frameparam), 2);2ms could likely fail here quite often, because even kernel code can be preempted. We should have something like 200ms here, just to avoid blocking indefinitely, but long enough not to happen even during high system load.
I got it.
Quoted 42 lines
[snip]
Quoted 9 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1233
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ framework->frameparams.state =FRAME_STATE_INIT ; + framework->frameparams.frame_no = +atomic_inc_return (&dip_hw->dip_enque_cnt);It sounds like the struct passed as the frameparams argument to this function and
framework->frameparamsshould be two different structs.Quoted 6 lines
I'm not sure if I understand it. Would you like to elaborate on this point?
I would like to merge
mtk_dip_hw_enqueueandmtk_dip_pipe_job_startso that we can configure theframework->frameparamsin a single function.Ah, that comment might have been added before I noticed that the functions can be merged. Forgot to remove, sorry. Please ignore.
[snip]
Quoted 15 lines
Quoted 5 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+static int __maybe_unused mtk_dip_pm_suspend (struct device *dev) +{ +struct mtk_dip_dev *dip_dev =dev_get_drvdata (dev); + +if (atomic_read (&dip_dev->dip_hw.dip_user_cnt) >0 ) {Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1326
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+mtk_dip_hw_set_clk (&dip_dev->dip_hw, false); +dev_dbg (&dip_dev->pdev->dev,"%s: disable clock\n" , + __func__); + }Don't we need to do something to prevent the driver from scheduling next frames here and wait for the hardware to finish processing current frame here?
Quoted 3 lines
I will add some design to handle this case. Could we add a suspend variable in
mtk_dip_hwand check it in submit work kthread?
Quoted 8 lines
Actually, with the other changes, the kthread would have been frozen for us at this point, so maybe there isn't anything to do here! :)
OR, if we change the kthread to a workqueue (as per my other comment above), we could make the workqueue freezable (by adding
WQ_FREEZABLEto the flags argument at creation time) and it would be frozen for us after finishing current work struct.
Thank you for the advice.
I would like to use workqueue with WQ_FREEZABLE.
Quoted 58 lines
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +return 0 ; +} + +static int __maybe_unused mtk_dip_pm_resume (struct device *dev) +{ +struct mtk_dip_dev *dip_dev =dev_get_drvdata (dev); +Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 1339
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +5
-0+if (atomic_read (&dip_dev->dip_hw.dip_user_cnt) >0 ) { +mtk_dip_hw_set_clk (&dip_dev->dip_hw, true); +dev_dbg (&dip_dev->pdev->dev,"%s: enable clock\n" , + __func__); + }Don't we need to kick off the hardware here to continue processing from the next frame?
Quoted 2 lines
I will add some design to handle this case.
As per above, making the kthreads/workqueues freezable actually should solve the problem.
[snip]
Quoted 27 lines
Quoted 18 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0+static int mtk_dip_subdev_close (struct v4l2_subdev *sd, +struct v4l2_subdev_fh *fh) +{ +struct mtk_dip_pipe *dip_pipe =mtk_dip_subdev_to_pipe (sd);drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 58
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0+struct mtk_dip_dev *dip_dev = +dev_get_drvdata (&dip_pipe->dip_dev->pdev->dev); + +dev_dbg (&dip_pipe->dip_dev->pdev->dev, +"%s:%s: pipe(%d) disconnect to dip_hw\n" , + __func__, dip_pipe->desc->name, + dip_pipe->desc->id); + +return mtk_dip_hw_disconnect (&dip_dev->dip_hw); +}We shouldn't do any hardware operations just at subdev open or close. Those should happen once the streaming actually starts.
Quoted 8 lines
Userspace is expected to open device nodes just to query them and that shouldn't have any side effects.
In general I don't see why we actually should even do anything in subdev ops in this driver. The subdev is only exposed to bridge all the video nodes together and any control is done via either video ioctls or metadata buffers.
Quoted 4 lines
I will move the hardware operation to streamon. We call
rproc_boot()to load frimware inmtk_dip_hw_connect(), should it be moved to streamon, too?
Quoted 8 lines
I think that would normally be done in runtime PM callbacks, with autosuspend delay enabled to avoid continuous power-off and on repeateadly.
Then, when there is a request to queue, the driver would call
pm_runtime_get_sync()and when a request completes,pm_runtime_put_autosuspend().
I got it. I will put it in PM callbacks and
use pm_runtime_get_sync() and pm_runtime_put_autosuspend() in request handling flow.
Quoted 20 lines
[snip]
Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +6
-0+static void mtk_dip_node_to_v4l2 (struct mtk_dip_pipe *dip_pipe, +u32 idx, +struct video_device *vdev, +struct v4l2_format *f) +{ +u32 cap;Quoted 9 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 616
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +5
-0+struct mtk_dip_video_device *node = &dip_pipe->nodes[idx]; + + cap =mtk_dip_node_get_v4l2_cap (dip_pipe, node); + vdev->ioctl_ops = node->desc->ops; + vdev->device_caps =V4L2_CAP_STREAMING | cap;Why not just have
mtk_dip_node_get_v4l2_cap()includeV4L2_CAP_STREAMINGin the return value?I would like to set the
V4L2_CAP_STREAMINGinnode->desc->capdirectly.
Quoted 7 lines
Quoted 2 lines
vdev->device_caps=node->desc->caps;Sure, that's also good.
Best regards,
Tomasz
Sincerely,
Frederic Chen
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Quoted 23 lines · Frederic Chen
Dear Tomasz,
Thank you for your comments.
Quoted 16 lines · Tomasz Figa
Hi Frederic,
Quoted 4 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
You're welcome. Thanks for replying to all the comments. I'll skip those resolved in my reply to keep the message shorter.
Quoted 5 lines · Tomasz Figa
Quoted 3 lines
Hi Frederic,
On Wed, Apr 17, 2019 at 7:45 PM Frederic Chen <frederic.chen-NuS5LvNUpcJWk0Htik3J/[email protected]> wrote:
[snip]
Quoted 50 lines
Quoted 26 lines
Quoted 16 lines
Quoted 16 lines
Also a general note - a work can be queued only once. This means that current code races when two
dip_worksare attempted to be queued very quickly one after another (or even at the same time from different threads).I can think of two potential options for fixing this:
1) Loop in the work function until there is nothing to queue to the hardware anymore - but this needs tricky synchronization, because there is still short time at the end of the work function when a new
dip_workcould be added.2) Change this to a kthread that just keeps running in a loop waiting for some available
dip_workto show up and then sending it to the firmware. This should be simpler, as the kthread shouldn't have a chance to miss anydip_workqueued.Quoted 5 lines
Quoted 3 lines
I'm personally in favor of option 2, as it should simplify the synchronization.
I would like to re-design this part with a kthread in the next patch.
Actually I missed another option. We could have 1
work_structfor 1 request and then we could keep using a workqueue. Perhaps that could be simpler than a kthread.Quoted 6 lines
Actually, similar approach could be used for the
dip_runner_func. Instead of having a kthread looping, we could just have another workqueue and 1dip_runner_workper 1 request. Then we wouldn't need to do the waiting loop ourselves anymore.Does it make sense?
Yes, it make sense. Let me summarize the modification about the flow.
First, we will have two
work_structinmtk_dip_request.struct mtk_dip_request { struct media_request request; //... /* Prepare DIP part hardware configurtion */ struct mtk_dip_hw_submit_work submit_work; /* Replace dip_running thread jobs*/ struct mtk_dip_hw_composing_work composing_work; /* Only for composing error handling */ struct mtk_dip_hw_mdpcb_timeout_work timeout_work; };Second, the overall flow of handling each request is :
Quoted 11 lines
1.
mtk_dip_hw_enqueuecallsqueue_work()to putsubmit_workinto its workqueue
2.submit_worksendsIMG_IPI_FRAMEcommand to SCP to prepare DIP hardware configuration
3.dip_scp_handlerreceives theIMG_IPI_FRAMEresult from SCP
4.dip_scp_handlercallsqueue_work()to putcomposing_work(instead of originaldip_runningthread jobs) into its workqueue
5.composing_workcallsdip_mdp_cmdq_send()to finish the mdp part tasks
6.dip_mdp_cb_func()trigged by MDP driver callsvb2_buffer_doneto return the buffer (no workqueue required here)
Sounds good to me, but actually then simply making the workqueues freezable doesn't solve the suspend/resume problem, because the work functions wouldn't wait for the firmware/hardware completion anymore. That's also okay, but in this case we need to add some code to suspend to wait for any pending operations to complete.
Best regards,
Tomasz
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
In reply to Frederic ChenDear Tomasz,
I'd like to elaborate more about the tuning_data.va.
Would you like to give us some advice about our improvement proposal inline?
Thank you very much.
Quoted 11 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +0
-0@@ -0,0 +1,1384 @@
[snip]
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +15
-0+static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); + +mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work = list_first_entry(&dip_hw->dip_worklist.queue,
[snip]
Quoted 28 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 633
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (dip_work->frameparams.tuning_data.pa ==0 ) { +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) has no tuning_data\n" , + __func__, dip_work->frameparams.frame_no); + +memcpy (&dip_work->frameparams.tuning_data, + &buf->tuning_buf,sizeof (buf->tuning_buf));Ditto.
I got it.
Quoted 3 lines
Quoted 1 line
+
memset((char *)buf->tuning_buf.va, 0, DIP_TUNING_SZ);Ditto.
I got it.
Quoted 8 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+/* +* When user enqueued without tuning buffer, +* it would use driver internal buffer. +* So, tuning_data.va should be 0 +*/ + dip_work->frameparams.tuning_data.va =0 ;
Quoted 7 lines
Quoted 3 lines
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
I will remove this unnecessary line.
Quoted 1 line
Quoted 1 line
+ }
After confirming the firmware part, I found that we use this field (tuning_data.va) to notify firmware if there is no tuning data from user.
- frameparams.tuning_data.va is 0: use the default tuning data in SCP, but we still need to pass frameparams.tuning_data.pa because the buffer contains some working buffer required.
- frameparams.tuning_data.va is not 0: the tuning data was passed from the user
Since we should not pass cpu addres to SCP, could I rename tuning_data.va as tuning_data.cookie, and write a constant value to indicate if SCP should use its internal default setting or not here?
For example,
/* SCP uses tuning data passed from userspace*/ dip_work->frameparams.tuning_data.cookie = MTK_DIP_USER_TUNING_DATA;
/* SCP uses internal tuning data */ dip_work->frameparams.tuning_data.cookie = MTK_DIP_DEFAULT_TUNING_DATA;
Quoted 13 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 643
Quoted 2 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +2
-0+ + dip_work->frameparams.drv_data = (u64 )dip_hw;Passing kernel pointers to firmware?
I will remove this line.
Quoted 6 lines
Quoted 5 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +4
-0+ dip_work->frameparams.state =FRAME_STATE_COMPOSING ; + +memcpy ((void *)buf->frameparam.va, &dip_work->frameparams, +sizeof (dip_work->frameparams));
Quoted 9 lines
Quoted 2 lines
There shouldn't be a need to type cast the pointer.
I will fix it.
Quoted 4 lines
Quoted 3 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +3
-0+ + dip_send(dip_hw->vpu_pdev, SCP_IPI_DIP_FRAME, + (void *)&dip_work->frameparams,
[snip]
Sincerely,
Frederic Chen
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Quoted 94 lines · Frederic Chen
Dear Tomasz,
I'd like to elaborate more about the tuning_data.va.
Would you like to give us some advice about our improvement proposal inline?Thank you very much.
Quoted 11 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +0
-0@@ -0,0 +1,1384 @@[snip]
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +15
-0+static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); + +mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work = list_first_entry(&dip_hw->dip_worklist.queue,[snip]
Quoted 28 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c line 633
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (dip_work->frameparams.tuning_data.pa ==0 ) { +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) has no tuning_data\n" , + __func__, dip_work->frameparams.frame_no); + +memcpy (&dip_work->frameparams.tuning_data, + &buf->tuning_buf,sizeof (buf->tuning_buf));Ditto.
I got it.
Quoted 3 lines
Quoted 1 line
+
memset((char *)buf->tuning_buf.va, 0, DIP_TUNING_SZ);Ditto.
I got it.
Quoted 8 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+/* +* When user enqueued without tuning buffer, +* it would use driver internal buffer. +* So, tuning_data.va should be 0 +*/ + dip_work->frameparams.tuning_data.va =0 ;Quoted 7 lines
Quoted 3 lines
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
I will remove this unnecessary line.
Quoted 1 line
Quoted 1 line
+ }
After confirming the firmware part, I found that we use this field (tuning_data.va) to notify firmware if there is no tuning data from user.
- frameparams.tuning_data.va is 0: use the default tuning data in SCP, but we still need to pass frameparams.tuning_data.pa because the buffer contains some working buffer required.
- frameparams.tuning_data.va is not 0: the tuning data was passed from the userSince we should not pass cpu addres to SCP, could I rename tuning_data.va as tuning_data.cookie, and write a constant value to indicate if SCP should use its internal default setting or not here?
Quoted 6 lines
For example,
/* SCP uses tuning data passed from userspace*/dip_work->frameparams.tuning_data.cookie=MTK_DIP_USER_TUNING_DATA;/* SCP uses internal tuning data */
dip_work->frameparams.tuning_data.cookie=MTK_DIP_DEFAULT_TUNING_DATA;
Perhaps we could just call it "present" and set to true or false?
Best regards,
Tomasz
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Hi Tomasz,
Quoted 96 lines · Tomasz Figa
Quoted 94 lines · Frederic Chen
Dear Tomasz,
I'd like to elaborate more about the tuning_data.va.
Would you like to give us some advice about our improvement proposal inline?Thank you very much.
Quoted 11 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +0
-0@@ -0,0 +1,1384 @@[snip]
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +15
-0+static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); + +mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work = list_first_entry(&dip_hw->dip_worklist.queue,[snip]
Quoted 28 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (dip_work->frameparams.tuning_data.pa ==0 ) { +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) has no tuning_data\n" , + __func__, dip_work->frameparams.frame_no); + +memcpy (&dip_work->frameparams.tuning_data, + &buf->tuning_buf,sizeof (buf->tuning_buf));Ditto.
I got it.
Quoted 3 lines
Quoted 1 line
+
memset((char *)buf->tuning_buf.va, 0, DIP_TUNING_SZ);Ditto.
I got it.
Quoted 8 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+/* +* When user enqueued without tuning buffer, +* it would use driver internal buffer. +* So, tuning_data.va should be 0 +*/ + dip_work->frameparams.tuning_data.va =0 ;Quoted 7 lines
Quoted 3 lines
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
I will remove this unnecessary line.
Quoted 1 line
Quoted 1 line
+ }
After confirming the firmware part, I found that we use this field (tuning_data.va) to notify firmware if there is no tuning data from user.
- frameparams.tuning_data.va is 0: use the default tuning data in SCP, but we still need to pass frameparams.tuning_data.pa because the buffer contains some working buffer required.
- frameparams.tuning_data.va is not 0: the tuning data was passed from the userSince we should not pass cpu addres to SCP, could I rename tuning_data.va as tuning_data.cookie, and write a constant value to indicate if SCP should use its internal default setting or not here?
Quoted 9 lines
Quoted 6 lines
For example,
/* SCP uses tuning data passed from userspace*/dip_work->frameparams.tuning_data.cookie=MTK_DIP_USER_TUNING_DATA;/* SCP uses internal tuning data */
dip_work->frameparams.tuning_data.cookie=MTK_DIP_DEFAULT_TUNING_DATA;Perhaps we could just call it "present" and set to true or false?
Yes. I would like to use "present" here.
Original:
struct img_addr {
u64 va; /* Used by Linux OS access */
u32 pa; /* Used by CM4 access */
u32 iova; /* Used by IOMMU HW access */
} __attribute__ ((__packed__));
struct img_ipi_frameparam {
u32 index;
u32 frame_no;
u64 timestamp;
u8 type; /* enum mdp_stream_type */
u8 state;
u8 num_inputs;
u8 num_outputs;
u64 drv_data;
struct img_input inputs[IMG_MAX_HW_INPUTS];
struct img_output outputs[IMG_MAX_HW_OUTPUTS];
struct img_addr tuning_data;
struct img_addr subfrm_data;
struct img_sw_addr config_data;
struct img_sw_addr self_data;
} __attribute__ ((__packed__));Modified:
struct tuning_buf {
u8 present;
u32 pa; /* Used by CM4 access */
u32 iova; /* Used by IOMMU HW access */ } __attribute__ ((__packed__));
struct img_ipi_frameparam {
/* ... */
struct tuning_buf tuning_data;
/* ... */
} __attribute__ ((__packed__));Quoted 2 lines
Best regards,
Tomasz
Sincerely,
Frederic Chen
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Quoted 138 lines · Frederic Chen
Hi Tomasz,
Quoted 96 lines · Tomasz Figa
Quoted 94 lines · Frederic Chen
Dear Tomasz,
I'd like to elaborate more about the tuning_data.va.
Would you like to give us some advice about our improvement proposal inline?Thank you very much.
Quoted 11 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +0
-0@@ -0,0 +1,1384 @@[snip]
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +15
-0+static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); + +mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work = list_first_entry(&dip_hw->dip_worklist.queue,[snip]
Quoted 28 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (dip_work->frameparams.tuning_data.pa ==0 ) { +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) has no tuning_data\n" , + __func__, dip_work->frameparams.frame_no); + +memcpy (&dip_work->frameparams.tuning_data, + &buf->tuning_buf,sizeof (buf->tuning_buf));Ditto.
I got it.
Quoted 3 lines
Quoted 1 line
+
memset((char *)buf->tuning_buf.va, 0, DIP_TUNING_SZ);Ditto.
I got it.
Quoted 8 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+/* +* When user enqueued without tuning buffer, +* it would use driver internal buffer. +* So, tuning_data.va should be 0 +*/ + dip_work->frameparams.tuning_data.va =0 ;Quoted 7 lines
Quoted 3 lines
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
I will remove this unnecessary line.
Quoted 1 line
Quoted 1 line
+ }
After confirming the firmware part, I found that we use this field (tuning_data.va) to notify firmware if there is no tuning data from user.
- frameparams.tuning_data.va is 0: use the default tuning data in SCP, but we still need to pass frameparams.tuning_data.pa because the buffer contains some working buffer required.
- frameparams.tuning_data.va is not 0: the tuning data was passed from the userSince we should not pass cpu addres to SCP, could I rename tuning_data.va as tuning_data.cookie, and write a constant value to indicate if SCP should use its internal default setting or not here?
Quoted 9 lines
Quoted 6 lines
For example,
/* SCP uses tuning data passed from userspace*/dip_work->frameparams.tuning_data.cookie=MTK_DIP_USER_TUNING_DATA;/* SCP uses internal tuning data */
dip_work->frameparams.tuning_data.cookie=MTK_DIP_DEFAULT_TUNING_DATA;Perhaps we could just call it "present" and set to true or false?
Yes. I would like to use "present" here.
Original:
structimg_addr{
u64 va; /* Used by Linux OS access */
u32 pa; /* Used by CM4 access */
u32 iova; /* Used by IOMMU HW access */
}__attribute__((__packed__));struct img_ipi_frameparam { u32 index; u32 frame_no; u64 timestamp; u8 type; /* enum mdp_stream_type */ u8 state; u8 num_inputs; u8 num_outputs; u64 drv_data; struct img_input inputs[IMG_MAX_HW_INPUTS]; struct img_output outputs[IMG_MAX_HW_OUTPUTS]; struct img_addr tuning_data; struct img_addr subfrm_data; struct img_sw_addr config_data; struct img_sw_addr self_data; } __attribute__ ((__packed__));
Quoted 3 lines
Modified:
struct tuning_buf { u8 present;
I'd make this u32 to keep the other fields aligned.
Quoted 3 lines
u32 pa; /* Used by CM4 access */
u32 iova; /* Used by IOMMU HW access */
}__attribute__((__packed__));
Best regards,
Tomasz
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Hi Tomasz,
Quoted 140 lines · Tomasz Figa
Quoted 138 lines · Frederic Chen
Hi Tomasz,
Quoted 96 lines · Tomasz Figa
Quoted 94 lines · Frederic Chen
Dear Tomasz,
I'd like to elaborate more about the tuning_data.va.
Would you like to give us some advice about our improvement proposal inline?Thank you very much.
Quoted 11 lines · Frederic Chen
Dear Tomasz,
I appreciate your comment. It is very helpful for us.
Quoted 6 lines
Quoted 6 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +0
-0@@ -0,0 +1,1384 @@[snip]
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +15
-0+static void dip_submit_worker (struct work_struct *work) +{ +struct mtk_dip_hw_submit_work *dip_submit_work = + container_of(work, struct mtk_dip_hw_submit_work, frame_work); +struct mtk_dip_hw *dip_hw = dip_submit_work->dip_hw; +struct mtk_dip_dev *dip_dev =mtk_dip_hw_to_dev (dip_hw); +struct mtk_dip_hw_work *dip_work; +struct mtk_dip_hw_subframe *buf; +u32 len, num; +int ret; + + num =atomic_read (&dip_hw->num_composing); + +mutex_lock (&dip_hw->dip_worklist.queuelock); + dip_work = list_first_entry(&dip_hw->dip_worklist.queue,[snip]
Quoted 28 lines
Quoted 11 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c
Quoted 8 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +8
-0+ +if (dip_work->frameparams.tuning_data.pa ==0 ) { +dev_dbg (&dip_dev->pdev->dev, +"%s: frame_no(%d) has no tuning_data\n" , + __func__, dip_work->frameparams.frame_no); + +memcpy (&dip_work->frameparams.tuning_data, + &buf->tuning_buf,sizeof (buf->tuning_buf));Ditto.
I got it.
Quoted 3 lines
Quoted 1 line
+
memset((char *)buf->tuning_buf.va, 0, DIP_TUNING_SZ);Ditto.
I got it.
Quoted 8 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-sys.c new file +6
-0+/* +* When user enqueued without tuning buffer, +* it would use driver internal buffer. +* So, tuning_data.va should be 0 +*/ + dip_work->frameparams.tuning_data.va =0 ;Quoted 7 lines
Quoted 3 lines
I don't understand this. We just zeroed the buffer via this kernel VA few lines above, so why would it have to be set to 0?
I will remove this unnecessary line.
Quoted 1 line
Quoted 1 line
+ }
After confirming the firmware part, I found that we use this field (tuning_data.va) to notify firmware if there is no tuning data from user.
- frameparams.tuning_data.va is 0: use the default tuning data in SCP, but we still need to pass frameparams.tuning_data.pa because the buffer contains some working buffer required.
- frameparams.tuning_data.va is not 0: the tuning data was passed from the userSince we should not pass cpu addres to SCP, could I rename tuning_data.va as tuning_data.cookie, and write a constant value to indicate if SCP should use its internal default setting or not here?
Quoted 9 lines
Quoted 6 lines
For example,
/* SCP uses tuning data passed from userspace*/dip_work->frameparams.tuning_data.cookie=MTK_DIP_USER_TUNING_DATA;/* SCP uses internal tuning data */
dip_work->frameparams.tuning_data.cookie=MTK_DIP_DEFAULT_TUNING_DATA;Perhaps we could just call it "present" and set to true or false?
Yes. I would like to use "present" here.
Original:
structimg_addr{
u64 va; /* Used by Linux OS access */
u32 pa; /* Used by CM4 access */
u32 iova; /* Used by IOMMU HW access */
}__attribute__((__packed__));struct img_ipi_frameparam { u32 index; u32 frame_no; u64 timestamp; u8 type; /* enum mdp_stream_type */ u8 state; u8 num_inputs; u8 num_outputs; u64 drv_data; struct img_input inputs[IMG_MAX_HW_INPUTS]; struct img_output outputs[IMG_MAX_HW_OUTPUTS]; struct img_addr tuning_data; struct img_addr subfrm_data; struct img_sw_addr config_data; struct img_sw_addr self_data; } __attribute__ ((__packed__));
Quoted 10 lines
Quoted 3 lines
Modified:
struct tuning_buf { u8 present;I'd make this u32 to keep the other fields aligned.
Quoted 3 lines
u32 pa; /* Used by CM4 access */
u32 iova; /* Used by IOMMU HW access */
}__attribute__((__packed__));
We will use u32 to keep the fields aligned in next patch.
Quoted 2 lines
Best regards,
Tomasz
Sincerely,
Frederic Chen
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
In reply to Tomasz FigaDear Tomasz,
Would you comment on the following points in further? Thank you for the review.
Quoted 2 lines · Tomasz Figa
Hi Frederic,
[snip]
Quoted 20 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+int mtk_dip_pipe_job_start (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +struct platform_device *pdev = dip_pipe->dip_dev->pdev; +int ret; +int out_img_buf_idx; +struct img_ipi_frameparam dip_param;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1023
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+struct mtk_dip_dev_buffer *dev_buf_in; +struct mtk_dip_dev_buffer *dev_buf_out; +struct mtk_dip_dev_buffer *dev_buf_tuning; + +if (!pipe_job_info) { +dev_err (&pdev->dev, +"pipe_job_info(%p) in start can't be NULL\n" , + pipe_job_info); +return -EINVAL ; + }This should be impossible to happen.
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1036
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +13
-0+ +/* We need RAW and at least MDP0 or MDP 1 buffer */ +if (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ] || + (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ] && + !pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ])){ +struct mtk_dip_dev_buffer **map = pipe_job_info->buf_map; + +dev_dbg (&pdev->dev, +"can't trigger job: raw(%p), mdp0(%p), mdp1(%p)\n" , + map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ], + map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ], + map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ]); +return -EINVAL ;This must be validated at the time of
request_validate. We can't fail at this stage anymore.
After the modification about checking the required buffers in req_validate(), we got failed in the following testRequests() of V4L2 compliance test. The V4L2 compliance test case doesn't know which buffers of the video devices are required and expects that the MEDIA_REQUEST_IOC_QUEUE succeed when the request has any valid buffer.
For example, when the request has MDP 0 buffer only, the DIP's req_validate() should return an error since it also need a buffer from RAW video device, but it make compliance test get failed.
May I still check the required buffers in req_validate() in the next patch? I will add some note to explain that the compliance test failed item is related to the limitation?
=======================================================
int testRequests(struct node *node, bool test_streaming) // ......
if (i)
fail_on_test(!buf.qbuf(node));
buf.s_flags(buf.g_flags() | V4L2_BUF_FLAG_REQUEST_FD); buf.s_request_fd(buf_req_fds[i]); buf.s_field(V4L2_FIELD_ANY);
fail_on_test(buf.qbuf(node));
if (v4l_type_is_video(buf.g_type()) && v4l_type_is_output(buf.g_type()))
fail_on_test(buf.g_field() == V4L2_FIELD_ANY);
fail_on_test(buf.querybuf(node, i));
// ......
// LINE 1807 in v4l2-test-buffers.cpp, we will got the failed here. // Since we need one RAW and one MDP0 buffer at least.
// v4l2-test-buffers.cpp(1807): doioctl_fd(buf_req_fds[i], // MEDIA_REQUEST_IOC_QUEUE, 0)
// test Requests: FAILfail_on_test(doioctl_fd(buf_req_fds[i], MEDIA_REQUEST_IOC_QUEUE, 0));
=======================================================
Quoted 13 lines
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +13
-0+ +static int mtk_dip_vb2_queue_setup (struct vb2_queue *vq, +unsigned int *num_buffers, +unsigned int *num_planes, +unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct mtk_dip_pipe *dip_pipe =vb2_get_drv_priv (vq); +struct mtk_dip_video_device *node = +mtk_dip_vbq_to_node (vq); +struct device *dev = &dip_pipe->dip_dev->pdev->dev; +struct device *buf_alloc_ctx; +
[snip]
Quoted 18 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0+ +if (vq->type ==V4L2_BUF_TYPE_META_CAPTURE || + vq->type ==V4L2_BUF_TYPE_META_OUTPUT ) + size = fmt->fmt.meta.buffersize;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 182
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0+else + size = fmt->fmt.pix_mp.plane_fmt[0 ].sizeimage; + +if (*num_planes) { +if (sizes[0 ] < size) { +dev_dbg (dev,"%s:%s:%s: size error(user:%d, max:%d)\n" , + __func__, dip_pipe->desc->name, + node->desc->name, sizes[0 ], size); +return -EINVAL ; + }I don't think this is an error. This is for handling
VIDIOC_CREATE_BUFS, which can allocate for any arbitrary format.
Quoted 2 lines
Whether the size of the buffer is big enough for current format should be checked in .buf_prepare callback.
When executing V4L2 compliance test, we need to check this image size to pass the following q.create_bufs() test (LINE:709, v4l2-test-buffers.cpp).
========================================================node->g_fmt(fmt, q.g_type());
//....fmt.s_height(fmt.g_height() / 2);
for (unsigned p = 0; p < fmt.g_num_planes(); p++)
fmt.s_sizeimage(fmt.g_sizeimage(p) / 2, p);
// LINE 709 in v4l2-test-buffers.cpp
// It seems that the driver needs to return EINVAL when the buffer //size is smaller than the sizeimage required
fail_on_test(q.create_bufs(node, 1, &fmt) != EINVAL);
========================================================
The kernel document has some similar description on VIDIOC_CREATE_BUFS.
https://www.kernel.org/doc/html/latest/media/uapi/v4l/vidioc-create-bufs.html
=======================================================
Usually if the format.pix.sizeimage field is less than the minimum required for the given format, then an error will be returned since drivers will typically not allow this.
=======================================================
Should we check the image size of each plane here so that we can pass the test?
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 194
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +12
-0+ }else { + *num_planes =1 ; + sizes[0 ] = size; + } + +dev_dbg (dev,"%s:%s:%s: n_planes(%d), n_bufs(%d), size(%d)\n" , + __func__, dip_pipe->desc->name, + node->desc->name, *num_planes, *num_buffers, sizes[0 ]); + +return 0 ; +} +
Sincerely,
Frederic Chen
Re: [RFC PATCH V1 6/6] platform: mtk-isp: Add Mediatek DIP driver
Hi Frederic,
Quoted 78 lines · Frederic Chen
Dear Tomasz,
Would you comment on the following points in further? Thank you for the review.
Quoted 2 lines · Tomasz Figa
Hi Frederic,
[snip]
Quoted 20 lines
Quoted 7 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +7
-0+int mtk_dip_pipe_job_start (struct mtk_dip_pipe *dip_pipe, +struct mtk_dip_pipe_job_info *pipe_job_info) +{ +struct platform_device *pdev = dip_pipe->dip_dev->pdev; +int ret; +int out_img_buf_idx; +struct img_ipi_frameparam dip_param;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1023
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +10
-0+struct mtk_dip_dev_buffer *dev_buf_in; +struct mtk_dip_dev_buffer *dev_buf_out; +struct mtk_dip_dev_buffer *dev_buf_tuning; + +if (!pipe_job_info) { +dev_err (&pdev->dev, +"pipe_job_info(%p) in start can't be NULL\n" , + pipe_job_info); +return -EINVAL ; + }This should be impossible to happen.
Quoted 16 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c line 1036
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c new file +13
-0+ +/* We need RAW and at least MDP0 or MDP 1 buffer */ +if (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ] || + (!pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ] && + !pipe_job_info->buf_map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ])){ +struct mtk_dip_dev_buffer **map = pipe_job_info->buf_map; + +dev_dbg (&pdev->dev, +"can't trigger job: raw(%p), mdp0(%p), mdp1(%p)\n" , + map[MTK_DIP_VIDEO_NODE_ID_RAW_OUT ], + map[MTK_DIP_VIDEO_NODE_ID_MDP0_CAPTURE ], + map[MTK_DIP_VIDEO_NODE_ID_MDP1_CAPTURE ]); +return -EINVAL ;This must be validated at the time of
request_validate. We can't fail at this stage anymore.After the modification about checking the required buffers in
req_validate(), we got failed in the followingtestRequests()of V4L2 compliance test. The V4L2 compliance test case doesn't know which buffers of the video devices are required and expects that theMEDIA_REQUEST_IOC_QUEUEsucceed when the request has any valid buffer.For example, when the request has MDP 0 buffer only, the DIP's
req_validate()should return an error since it also need a buffer from RAW video device, but it make compliance test get failed.May I still check the required buffers in
req_validate()in the next patch? I will add some note to explain that the compliance test failed item is related to the limitation?=======================================================
inttestRequests(struct node *node, bool test_streaming)// ......
if (i)fail_on_test(!buf.qbuf(node));
buf.s_flags(buf.g_flags() | V4L2_BUF_FLAG_REQUEST_FD);buf.s_request_fd(buf_req_fds[i]);buf.s_field(V4L2_FIELD_ANY);
fail_on_test(buf.qbuf(node));
if (v4l_type_is_video(buf.g_type()) && v4l_type_is_output(buf.g_type()))fail_on_test(buf.g_field() == V4L2_FIELD_ANY);
fail_on_test(buf.querybuf(node, i));// ......
Quoted 8 lines
// LINE 1807 in v4l2-test-buffers.cpp, we will got the failed here. // Since we need one RAW and one MDP0 buffer at least.
// v4l2-test-buffers.cpp(1807):doioctl_fd(buf_req_fds[i], // MEDIA_REQUEST_IOC_QUEUE, 0)
// test Requests: FAILfail_on_test(doioctl_fd(buf_req_fds[i], MEDIA_REQUEST_IOC_QUEUE, 0));
=======================================================
Sounds like a limitation of the compliance test. Request API testing there is still new and possibly just made for simple mem-to-mem devices.
Hans, the driver always requires some buffers to be given, like the raw frame input, while other, e.g. downscaled output, are optional. Any ideas?
Quoted 58 lines
Quoted 13 lines
Quoted 13 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +13
-0+ +static int mtk_dip_vb2_queue_setup (struct vb2_queue *vq, +unsigned int *num_buffers, +unsigned int *num_planes, +unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct mtk_dip_pipe *dip_pipe =vb2_get_drv_priv (vq); +struct mtk_dip_video_device *node = +mtk_dip_vbq_to_node (vq); +struct device *dev = &dip_pipe->dip_dev->pdev->dev; +struct device *buf_alloc_ctx; +[snip]
Quoted 18 lines
Quoted 4 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +4
-0+ +if (vq->type ==V4L2_BUF_TYPE_META_CAPTURE || + vq->type ==V4L2_BUF_TYPE_META_OUTPUT ) + size = fmt->fmt.meta.buffersize;drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c line 182
Quoted 10 lines
drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c new file +10
-0+else + size = fmt->fmt.pix_mp.plane_fmt[0 ].sizeimage; + +if (*num_planes) { +if (sizes[0 ] < size) { +dev_dbg (dev,"%s:%s:%s: size error(user:%d, max:%d)\n" , + __func__, dip_pipe->desc->name, + node->desc->name, sizes[0 ], size); +return -EINVAL ; + }I don't think this is an error. This is for handling
VIDIOC_CREATE_BUFS, which can allocate for any arbitrary format.Quoted 2 lines
Whether the size of the buffer is big enough for current format should be checked in .buf_prepare callback.
When executing V4L2 compliance test, we need to check this image size to pass the following
q.create_bufs()test (LINE:709, v4l2-test-buffers.cpp).========================================================
node->g_fmt(fmt, q.g_type());
//....fmt.s_height(fmt.g_height() / 2);
for (unsigned p = 0; p <fmt.g_num_planes(); p++)fmt.s_sizeimage(fmt.g_sizeimage(p) / 2, p);// LINE 709 in v4l2-test-buffers.cpp
// It seems that the driver needs to return EINVAL when the buffer //size is smaller than the sizeimage requiredfail_on_test(q.create_bufs(node, 1, &fmt) != EINVAL);========================================================
The kernel document has some similar description on
VIDIOC_CREATE_BUFS.https://www.kernel.org/doc/html/latest/media/uapi/v4l/vidioc-create-bufs.html
Quoted 8 lines
=======================================================
Usually if the format.pix.sizeimage field is less than the minimum required for the given format, then an error will be returned since drivers will typically not allow this.
=======================================================Should we check the image size of each plane here so that we can pass the test?
Note that "given format" there means the format field of structv4l2_create_buffers, _not_ the currently active format. That's really strange because we don't get that inside queue_setup.
Hans, how should we handle this in the driver? Right now we just call vb2_create_bufs(), which doesn't care about anything else than sizeimage. Do we need to implement our own .vidioc_create_bufs() handler that validates the sizeimage wrt the other parts of the given format before calling vb2_create_bufs()?
Another thing is that the spec isn't very precise on this, especially given the "usually" and "typically" in the description quoted above.
Best regards,
Tomasz