Hi Jungo, On Tue, Jun 11, 2019 at 11:53:40AM +0800, Jungo Lin wrote: > Reserved Mediatek ISP P1 V4L2 control number with 16. > Moreover, add two V4L2 controls for ISP P1 user space > usage. > > 1. V4L2_CID_MTK_GET_BIN_INFO > - Provide the image output width & height in case > camera binning mode is enabled. Could you explain with a bit more details what these binned width and height would mean? How would they relate to the video CAPTURE node width and height? Isn't this something that should be rather exposed as an appropriate selection rectangle, instead of custom controls? > > 2. V4L2_CID_MTK_RAW_PATH > - Export the path control of the main stream to user space. > One is pure raw and the other is processing raw. > The default value is 0 which outputs the pure raw bayer image > from sesnor, without image processing in ISP HW. Is it just effectively a full processing bypass? The driver seems to only update the related configuration when the streaming starts. Can it be controlled per-frame? Generally this sounds more like something that should be modelled using the media topology, similar to the example below. /----------------\ /-------------------\ /--------------\ | |---| | | | | Capture Subdev | | Processing Subdev |-o-| CAPTURE node | | |-\ | | | | | \----------------/ | \-------------------/ | \--------------/ | | \-----------------------/ Then the userspace can select whether it wants the image from the capture interface directly or procesed by the ISP by configuring the media links appropriately. The current limitation of this model is that it can't be easily configured per-frame, as media configurations are not included in the requests yet. [snip] > +static int handle_ctrl_get_bin_info(struct v4l2_ctrl *ctrl, int is_width) > +{ > + struct mtk_cam_dev *cam_dev = ctrl->priv; > + struct v4l2_format *fmt; > + > + fmt = &cam_dev->vdev_nodes[MTK_CAM_P1_MAIN_STREAM_OUT].vdev_fmt; > + > + dev_dbg(&cam_dev->pdev->dev, "Get bin info w*h:%d*%d is_width:%d", > + fmt->fmt.pix_mp.width, fmt->fmt.pix_mp.height, is_width); > + > + if (is_width) > + ctrl->val = fmt->fmt.pix_mp.width; > + else > + ctrl->val = fmt->fmt.pix_mp.height; This seems to contradict to what the comment in the header says, because it just always returns the video node format and doesn't seem to care about whether binning is enabled or not. > + > + return 0; > +} > + > +static int handle_ctrl_get_process_raw(struct v4l2_ctrl *ctrl) > +{ > + struct mtk_cam_dev *cam_dev = ctrl->priv; > + struct isp_p1_device *p1_dev = get_p1_device(&cam_dev->pdev->dev); > + > + ctrl->val = (p1_dev->isp_ctx.isp_raw_path == ISP_PROCESS_RAW_PATH); > + > + dev_dbg(&cam_dev->pdev->dev, "Get process raw:%d", ctrl->val); > + > + return 0; > +} > + > +static int handle_ctrl_set_process_raw(struct v4l2_ctrl *ctrl) > +{ > + struct mtk_cam_dev *cam_dev = ctrl->priv; > + struct isp_p1_device *p1_dev = get_p1_device(&cam_dev->pdev->dev); > + > + p1_dev->isp_ctx.isp_raw_path = (ctrl->val) ? > + ISP_PROCESS_RAW_PATH : ISP_PURE_RAW_PATH; > + dev_dbg(&cam_dev->pdev->dev, "Set process raw:%d", ctrl->val); > + return 0; > +} > + > +static int mtk_cam_dev_g_ctrl(struct v4l2_ctrl *ctrl) This is g_volatile_ctrl not, g_ctrl. > +{ > + switch (ctrl->id) { > + case V4L2_CID_MTK_PROCESSING_RAW: > + handle_ctrl_get_process_raw(ctrl); > + break; No need to provide getters for non-volatile controls. The framework manages them. > + case V4L2_CID_MTK_GET_BIN_WIDTH: > + handle_ctrl_get_bin_info(ctrl, 1); > + break; > + case V4L2_CID_MTK_GET_BIN_HEIGTH: > + handle_ctrl_get_bin_info(ctrl, 0); It's trivial to get the value, so there isn't much benefit in having a function to do so, especially if one needs something like a is_width argument that further complicates the code. > + break; > + default: > + return -EINVAL; > + } > + return 0; > +} > + > +static int mtk_cam_dev_s_ctrl(struct v4l2_ctrl *ctrl) > +{ > + switch (ctrl->id) { > + case V4L2_CID_MTK_PROCESSING_RAW: > + return handle_ctrl_set_process_raw(ctrl); Same as above. The operation is too trivial to deserve a function. > + default: > + return -EINVAL; > + } > +} > + > +static const struct v4l2_ctrl_ops mtk_cam_dev_ctrl_ops = { > + .g_volatile_ctrl = mtk_cam_dev_g_ctrl, > + .s_ctrl = mtk_cam_dev_s_ctrl, > +}; > + > +struct v4l2_ctrl_config mtk_cam_controls[] = { > + { > + .ops = &mtk_cam_dev_ctrl_ops, > + .id = V4L2_CID_MTK_PROCESSING_RAW, > + .name = "MTK CAM PROCESSING RAW", > + .type = V4L2_CTRL_TYPE_BOOLEAN, > + .min = 0, > + .max = 1, > + .step = 1, > + .def = 1, > + }, > + { > + .ops = &mtk_cam_dev_ctrl_ops, > + .id = V4L2_CID_MTK_GET_BIN_WIDTH, > + .name = "MTK CAM GET BIN WIDTH", > + .type = V4L2_CTRL_TYPE_INTEGER, > + .min = IMG_MIN_WIDTH, > + .max = IMG_MAX_WIDTH, > + .step = 1, > + .def = IMG_MAX_WIDTH, > + .flags = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE, > + }, > + { > + .ops = &mtk_cam_dev_ctrl_ops, > + .id = V4L2_CID_MTK_GET_BIN_HEIGTH, > + .name = "MTK CAM GET BIN HEIGHT", > + .type = V4L2_CTRL_TYPE_INTEGER, > + .min = IMG_MIN_HEIGHT, > + .max = IMG_MAX_HEIGHT, > + .step = 1, > + .def = IMG_MAX_HEIGHT, > + .flags = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE, > + }, > +}; > + > +int mtk_cam_ctrl_init(struct mtk_cam_dev *cam_dev, > + struct v4l2_ctrl_handler *hdl) > +{ > + unsigned int i; > + > + /* Initialized HW controls, allow V4L2_CID_MTK_CAM_MAX ctrls */ > + v4l2_ctrl_handler_init(hdl, V4L2_CID_MTK_CAM_MAX); > + if (hdl->error) { This should be checked at the end, after all the controls are added. Best regards, Tomasz