From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp.nokia.com ([147.243.128.26]:60979 "EHLO mgw-da02.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226Ab2BZBJm (ORCPT ); Sat, 25 Feb 2012 20:09:42 -0500 Message-ID: <4F498641.7080809@iki.fi> Date: Sun, 26 Feb 2012 03:09:21 +0200 From: Sakari Ailus MIME-Version: 1.0 To: Laurent Pinchart CC: linux-media@vger.kernel.org, hverkuil@xs4all.nl, teturtia@gmail.com, dacohen@gmail.com, snjw23@gmail.com, andriy.shevchenko@linux.intel.com, t.stanislaws@samsung.com, tuukkat76@gmail.com, k.debski@gmail.com, riverful@gmail.com Subject: Re: [PATCH v3 25/33] omap3isp: Introduce omap3isp_get_external_info() References: <20120220015605.GI7784@valkosipuli.localdomain> <1329703032-31314-25-git-send-email-sakari.ailus@iki.fi> <3168869.IBFJLUCLKu@avalon> In-Reply-To: <3168869.IBFJLUCLKu@avalon> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Hi Laurent, Laurent Pinchart wrote: > Hi Sakari, > > Thanks for the patch. > > On Monday 20 February 2012 03:57:04 Sakari Ailus wrote: >> omap3isp_get_external_info() will retrieve external subdev's bits-per-pixel >> and pixel rate for the use of other ISP subdevs at streamon time. >> omap3isp_get_external_info() is used during pipeline validation. >> >> Signed-off-by: Sakari Ailus >> --- >> drivers/media/video/omap3isp/isp.c | 48 >> ++++++++++++++++++++++++++++++++++++ drivers/media/video/omap3isp/isp.h | >> 3 ++ >> 2 files changed, 51 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/media/video/omap3isp/isp.c >> b/drivers/media/video/omap3isp/isp.c index 12d5f92..89a9bf8 100644 >> --- a/drivers/media/video/omap3isp/isp.c >> +++ b/drivers/media/video/omap3isp/isp.c >> @@ -353,6 +353,54 @@ void omap3isp_hist_dma_done(struct isp_device *isp) >> } >> } >> >> +int omap3isp_get_external_info(struct isp_pipeline *pipe, >> + struct media_link *link) >> +{ >> + struct isp_device *isp = >> + container_of(pipe, struct isp_video, pipe)->isp; >> + struct v4l2_subdev_format fmt; >> + struct v4l2_ext_controls ctrls; >> + struct v4l2_ext_control ctrl; >> + int ret; >> + >> + if (!pipe->external) >> + return 0; >> + >> + if (pipe->external_rate) >> + return 0; >> + >> + memset(&fmt, 0, sizeof(fmt)); >> + >> + fmt.pad = link->source->index; >> + fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; >> + ret = v4l2_subdev_call(media_entity_to_v4l2_subdev(link->sink->entity), >> + pad, get_fmt, NULL, &fmt); >> + if (ret < 0) >> + return -EPIPE; >> + >> + pipe->external_bpp = omap3isp_video_format_info(fmt.format.code)->bpp; >> + >> + memset(&ctrls, 0, sizeof(ctrls)); >> + memset(&ctrl, 0, sizeof(ctrl)); >> + >> + ctrl.id = V4L2_CID_PIXEL_RATE; >> + >> + ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(ctrl.id); >> + ctrls.count = 1; >> + ctrls.controls = &ctrl; >> + >> + ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, &ctrls); >> + if (ret < 0) { >> + dev_warn(isp->dev, "no pixel rate control in subdev %s\n", >> + pipe->external->name); >> + return ret; >> + } >> + >> + pipe->external_rate = ctrl.value64; >> + >> + return 0; >> +} > > What about moving this to ispvideo.c ? You could then call the function from > isp_video_streamon() only, and make it static. Done. >> + >> static inline void isp_isr_dbg(struct isp_device *isp, u32 irqstatus) >> { >> static const char *name[] = { >> diff --git a/drivers/media/video/omap3isp/isp.h >> b/drivers/media/video/omap3isp/isp.h index 2e78041..8b0bc2d 100644 >> --- a/drivers/media/video/omap3isp/isp.h >> +++ b/drivers/media/video/omap3isp/isp.h >> @@ -222,6 +222,9 @@ struct isp_device { >> >> void omap3isp_hist_dma_done(struct isp_device *isp); >> >> +int omap3isp_get_external_info(struct isp_pipeline *pipe, >> + struct media_link *link); >> + >> void omap3isp_flush(struct isp_device *isp); >> >> int omap3isp_module_sync_idle(struct media_entity *me, wait_queue_head_t >> *wait, -- Sakari Ailus sakari.ailus@iki.fi