From patchwork Fri Dec 23 11:42:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 38782 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cKOFc-0002eb-Ix; Fri, 23 Dec 2016 11:43:04 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cKOFY-0003r4-23; Fri, 23 Dec 2016 12:43:02 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755011AbcLWLmm (ORCPT + 1 other); Fri, 23 Dec 2016 06:42:42 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:57578 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753353AbcLWLmk (ORCPT ); Fri, 23 Dec 2016 06:42:40 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id C646082478; Fri, 23 Dec 2016 12:42:37 +0100 (CET) Date: Fri, 23 Dec 2016 12:42:37 +0100 From: Pavel Machek To: Sebastian Reichel Cc: Sakari Ailus , ivo.g.dimitrov.75@gmail.com, pali.rohar@gmail.com, linux-media@vger.kernel.org, galak@codeaurora.org, mchehab@osg.samsung.com, linux-kernel@vger.kernel.org Subject: Re: [RFC/PATCH] media: Add video bus switch Message-ID: <20161223114237.GA5879@amd> References: <20161023200355.GA5391@amd> <20161119232943.GF13965@valkosipuli.retiisi.org.uk> <20161214122451.GB27011@amd> <20161222100104.GA30917@amd> <20161222133938.GA30259@amd> <20161222143244.ykza4wdxmop2t7bg@earth> <20161222224226.GB31151@amd> <20161222234028.oxntlek2oy62cjnh@earth> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161222234028.oxntlek2oy62cjnh@earth> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.12.23.113318 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' BODY_PARA_IS_SENTENCE_URL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, KNOWN_FREEWEB_URI 0.05, MSGID_ADDED_BY_MTA 0.05, INVALID_MSGID_NO_FQDN 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __ATTACHMENT_SIZE_0_10K 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CD 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __FORWARDED_MSG 0, __HAS_ATTACHMENT 0, __HAS_ATTACHMENT1 0, __HAS_ATTACHMENT2 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __KNOWN_FREEWEB_URI2 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_TEXT_P2 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NS , __URI_WITH_PATH 0, __USER_AGENT 0' Hi! > > [...] > > > > static int isp_subdev_notifier_bound(struct v4l2_async_notifier *async, > > diff --git a/drivers/media/platform/video-bus-switch.c b/drivers/media/platform/video-bus-switch.c > > index 1a5d944..3a2d442 100644 > > --- a/drivers/media/platform/video-bus-switch.c > > +++ b/drivers/media/platform/video-bus-switch.c > > @@ -247,12 +247,21 @@ static int vbs_s_stream(struct v4l2_subdev *sd, int enable) > > { > > struct v4l2_subdev *subdev = vbs_get_remote_subdev(sd); > > > > + /* FIXME: we need to set the GPIO here */ > > + > > The gpio is set when the pad is selected, so no need to do it again. > The gpio selection actually works with your branch (assuming its > based on Ivo's). Yes. I did not notice... is there actually some interface to select the camera from userland? > > if (IS_ERR(subdev)) > > return PTR_ERR(subdev); > > > > return v4l2_subdev_call(subdev, video, s_stream, enable); > > } > > > > +static int vbs_g_endpoint_config(struct v4l2_subdev *sd, struct isp_bus_cfg *cfg) > > +{ > > + printk("vbs_g_endpoint_config...\n"); > > + return 0; > > +} > > Would be nice to find something more abstract than isp_bus_cfg, > which is specific to omap3isp. Yes, that should be doable. diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 45c69ed..f0aa8cd 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2024,44 +2054,51 @@ enum isp_of_phy { ISP_OF_PHY_CSIPHY2, }; -static void isp_of_parse_node_csi1(struct device *dev, - struct isp_bus_cfg *buscfg, +void __isp_of_parse_node_csi1(struct device *dev, + struct isp_ccp2_cfg *buscfg, struct v4l2_of_endpoint *vep) { - if (vep->base.port == ISP_OF_PHY_CSIPHY1) - buscfg->interface = ISP_INTERFACE_CCP2B_PHY1; - else - buscfg->interface = ISP_INTERFACE_CCP2B_PHY2; - buscfg->bus.ccp2.lanecfg.clk.pos = vep->bus.mipi_csi1.clock_lane; - buscfg->bus.ccp2.lanecfg.clk.pol = + buscfg->lanecfg.clk.pos = vep->bus.mipi_csi1.clock_lane; + buscfg->lanecfg.clk.pol = vep->bus.mipi_csi1.lane_polarity[0]; dev_dbg(dev, "clock lane polarity %u, pos %u\n", - buscfg->bus.ccp2.lanecfg.clk.pol, - buscfg->bus.ccp2.lanecfg.clk.pos); + buscfg->lanecfg.clk.pol, + buscfg->lanecfg.clk.pos); - buscfg->bus.ccp2.lanecfg.data[0].pos = vep->bus.mipi_csi2.data_lanes[0]; - buscfg->bus.ccp2.lanecfg.data[0].pol = + buscfg->lanecfg.data[0].pos = vep->bus.mipi_csi2.data_lanes[0]; + buscfg->lanecfg.data[0].pol = vep->bus.mipi_csi2.lane_polarities[1]; dev_dbg(dev, "data lane polarity %u, pos %u\n", - buscfg->bus.ccp2.lanecfg.data[0].pol, - buscfg->bus.ccp2.lanecfg.data[0].pos); + buscfg->lanecfg.data[0].pol, + buscfg->lanecfg.data[0].pos); - buscfg->bus.ccp2.strobe_clk_pol = vep->bus.mipi_csi1.clock_inv; - buscfg->bus.ccp2.phy_layer = vep->bus.mipi_csi1.strobe; - buscfg->bus.ccp2.ccp2_mode = vep->bus_type == V4L2_MBUS_CCP2; + buscfg->strobe_clk_pol = vep->bus.mipi_csi1.clock_inv; + buscfg->phy_layer = vep->bus.mipi_csi1.strobe; + buscfg->ccp2_mode = vep->bus_type == V4L2_MBUS_CCP2; dev_dbg(dev, "clock_inv %u strobe %u ccp2 %u\n", - buscfg->bus.ccp2.strobe_clk_pol, - buscfg->bus.ccp2.phy_layer, - buscfg->bus.ccp2.ccp2_mode); + buscfg->strobe_clk_pol, + buscfg->phy_layer, + buscfg->ccp2_mode); /* * FIXME: now we assume the CRC is always there. * Implement a way to obtain this information from the * sensor. Frame descriptors, perhaps? */ - buscfg->bus.ccp2.crc = 1; + buscfg->crc = 1; - buscfg->bus.ccp2.vp_clk_pol = 1; + buscfg->vp_clk_pol = 1; +} + +static void isp_of_parse_node_csi1(struct device *dev, + struct isp_bus_cfg *buscfg, + struct v4l2_of_endpoint *vep) +{ + if (vep->base.port == ISP_OF_PHY_CSIPHY1) + buscfg->interface = ISP_INTERFACE_CCP2B_PHY1; + else + buscfg->interface = ISP_INTERFACE_CCP2B_PHY2; + __isp_of_parse_node_csi1(dev, &buscfg->bus.ccp2, vep); } static void isp_of_parse_node_csi2(struct device *dev, @@ -2099,27 +2136,8 @@ static void isp_of_parse_node_csi2(struct device *dev, buscfg->bus.csi2.crc = 1; } -static int isp_of_parse_node_endpoint(struct device *dev, - struct device_node *node, - struct isp_async_subdev *isd) +static int isp_endpoint_to_buscfg(struct device *dev, struct v4l2_of_endpoint vep, struct isp_bus_cfg *buscfg) { - struct isp_bus_cfg *buscfg; - struct v4l2_of_endpoint vep; - int ret; - - isd->bus = devm_kzalloc(dev, sizeof(*isd->bus), GFP_KERNEL); - if (!isd->bus) - return -ENOMEM; - - buscfg = isd->bus; - - ret = v4l2_of_parse_endpoint(node, &vep); - if (ret) - return ret; - - dev_dbg(dev, "parsing endpoint %s, interface %u\n", node->full_name, - vep.base.port); - switch (vep.base.port) { case ISP_OF_PHY_PARALLEL: buscfg->interface = ISP_INTERFACE_PARALLEL; @@ -2147,10 +2165,35 @@ static int isp_of_parse_node_endpoint(struct device *dev, break; default: + return -1; + } + return 0; +} + +static int isp_of_parse_node_endpoint(struct device *dev, + struct device_node *node, + struct isp_async_subdev *isd) +{ + struct isp_bus_cfg *buscfg; + struct v4l2_of_endpoint vep; + int ret; + + isd->bus = devm_kzalloc(dev, sizeof(*isd->bus), GFP_KERNEL); + if (!isd->bus) + return -ENOMEM; + + buscfg = isd->bus; + + ret = v4l2_of_parse_endpoint(node, &vep); + if (ret) + return ret; + + dev_dbg(dev, "parsing endpoint %s, interface %u\n", node->full_name, + vep.base.port); + + if (isp_endpoint_to_buscfg(dev, vep, buscfg)) dev_warn(dev, "%s: invalid interface %u\n", node->full_name, vep.base.port); - break; - } return 0; } diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c index 2d1463a..a6763b3 100644 --- a/drivers/media/platform/omap3isp/ispccp2.c +++ b/drivers/media/platform/omap3isp/ispccp2.c @@ -23,6 +23,8 @@ #include #include +#include + #include "isp.h" #include "ispreg.h" #include "ispccp2.h" @@ -169,6 +171,7 @@ static int ccp2_if_enable(struct isp_ccp2_device *ccp2, u8 enable) pad = media_entity_remote_pad(&ccp2->pads[CCP2_PAD_SINK]); sensor = media_entity_to_v4l2_subdev(pad->entity); + /* Struct isp_bus_cfg has union inside */ buscfg = &((struct isp_bus_cfg *)sensor->host_priv)->bus.ccp2; @@ -369,6 +372,9 @@ static void ccp2_lcx_config(struct isp_ccp2_device *ccp2, isp_reg_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LC01_IRQENABLE, val); } +void __isp_of_parse_node_csi1(struct device *dev, + struct isp_ccp2_cfg *buscfg, + struct v4l2_of_endpoint *vep); /* * ccp2_if_configure - Configure ccp2 with data from sensor * @ccp2: Pointer to ISP CCP2 device @@ -390,6 +396,21 @@ static int ccp2_if_configure(struct isp_ccp2_device *ccp2) sensor = media_entity_to_v4l2_subdev(pad->entity); buscfg = sensor->host_priv; + { + struct v4l2_subdev *subdev2; + subdev2 = media_entity_to_v4l2_subdev(pad->entity); + struct v4l2_of_endpoint vep; + + printk("if_configure...\n"); + printk("2: %p\n", subdev2); + ret = v4l2_subdev_call(subdev2, video, g_endpoint_config, &vep); + if (ret == 0) { + printk("Success: have configuration\n"); + __isp_of_parse_node_csi1(NULL, &buscfg->bus.ccp2, &vep); + printk("Configured ok?\n"); + } + } + ret = ccp2_phyif_config(ccp2, &buscfg->bus.ccp2); if (ret < 0) return ret; diff --git a/drivers/media/platform/video-bus-switch.c b/drivers/media/platform/video-bus-switch.c index 1a5d944..3a2d442 100644 --- a/drivers/media/platform/video-bus-switch.c +++ b/drivers/media/platform/video-bus-switch.c @@ -247,12 +247,21 @@ static int vbs_s_stream(struct v4l2_subdev *sd, int enable) { struct v4l2_subdev *subdev = vbs_get_remote_subdev(sd); + + if (IS_ERR(subdev)) return PTR_ERR(subdev); return v4l2_subdev_call(subdev, video, s_stream, enable); } +static int vbs_g_endpoint_config(struct v4l2_subdev *sd, struct isp_bus_cfg *cfg) +{ + printk("vbs_g_endpoint_config...\n"); + return 0; +} + + static const struct v4l2_subdev_internal_ops vbs_internal_ops = { .registered = &vbs_registered, }; @@ -265,6 +274,7 @@ static const struct media_entity_operations vbs_media_ops = { /* subdev video operations */ static const struct v4l2_subdev_video_ops vbs_video_ops = { .s_stream = vbs_s_stream, + .g_endpoint_config = vbs_g_endpoint_config, }; static const struct v4l2_subdev_ops vbs_ops = { diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index cf778c5..30457b0 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -415,6 +415,8 @@ struct v4l2_subdev_video_ops { const struct v4l2_mbus_config *cfg); int (*s_rx_buffer)(struct v4l2_subdev *sd, void *buf, unsigned int *size); + int (*g_endpoint_config)(struct v4l2_subdev *sd, + struct v4l2_of_endpoint *cfg); }; /**