| Message ID | 1434537579-23417-2-git-send-email-josh.wu@atmel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Guennadi Liakhovetski |
| Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1Z5AhM-0001zi-BZ; Wed, 17 Jun 2015 12:36:00 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-7) with esmtp id 1Z5AhJ-00007P-2v; Wed, 17 Jun 2015 12:35:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754618AbbFQKfp (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Wed, 17 Jun 2015 06:35:45 -0400 Received: from nasmtp01.atmel.com ([192.199.1.245]:23789 "EHLO DVREDG01.corp.atmel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753064AbbFQKfg (ORCPT <rfc822;linux-media@vger.kernel.org>); Wed, 17 Jun 2015 06:35:36 -0400 Received: from apsmtp01.atmel.com (10.168.254.30) by DVREDG01.corp.atmel.com (10.42.103.30) with Microsoft SMTP Server (TLS) id 14.3.235.1; Wed, 17 Jun 2015 04:35:30 -0600 Received: from melon.corp.atmel.com (10.168.254.13) by apsmtp01.corp.atmel.com (10.168.254.30) with Microsoft SMTP Server id 14.3.235.1; Wed, 17 Jun 2015 18:35:44 +0800 From: Josh Wu <josh.wu@atmel.com> To: Linux Media Mailing List <linux-media@vger.kernel.org>, "Guennadi Liakhovetski" <g.liakhovetski@gmx.de> CC: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Josh Wu <josh.wu@atmel.com>, Mauro Carvalho Chehab <mchehab@osg.samsung.com>, <linux-kernel@vger.kernel.org> Subject: [PATCH 2/2] media: atmel-isi: move configure_geometry() to start_streaming() Date: Wed, 17 Jun 2015 18:39:39 +0800 Message-ID: <1434537579-23417-2-git-send-email-josh.wu@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434537579-23417-1-git-send-email-josh.wu@atmel.com> References: <1434537579-23417-1-git-send-email-josh.wu@atmel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.6.17.102416 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' |
Commit Message
Josh Wu
June 17, 2015, 10:39 a.m. UTC
As in set_fmt() function we only need to know which format is been set,
we don't need to access the ISI hardware in this moment.
So move the configure_geometry(), which access the ISI hardware, to
start_streaming() will make code more consistent and simpler.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
Comments
Hi Josh, Thank you for the patch. On Wednesday 17 June 2015 18:39:39 Josh Wu wrote: > As in set_fmt() function we only need to know which format is been set, > we don't need to access the ISI hardware in this moment. > > So move the configure_geometry(), which access the ISI hardware, to > start_streaming() will make code more consistent and simpler. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > --- > > drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) > > diff --git a/drivers/media/platform/soc_camera/atmel-isi.c > b/drivers/media/platform/soc_camera/atmel-isi.c index 8bc40ca..b01086d > 100644 > --- a/drivers/media/platform/soc_camera/atmel-isi.c > +++ b/drivers/media/platform/soc_camera/atmel-isi.c > @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, > unsigned int count) /* Disable all interrupts */ > isi_writel(isi, ISI_INTDIS, (u32)~0UL); > > + ret = configure_geometry(isi, icd->user_width, icd->user_height, > + icd->current_fmt->code); I would also make configure_geometry a void function, as the only failure case really can't occur. Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + if (ret < 0) > + return ret; > + > spin_lock_irq(&isi->lock); > /* Clear any pending interrupt */ > isi_readl(isi, ISI_STATUS); > @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue *q, > static int isi_camera_set_fmt(struct soc_camera_device *icd, > struct v4l2_format *f) > { > - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); > - struct atmel_isi *isi = ici->priv; > struct v4l2_subdev *sd = soc_camera_to_subdev(icd); > const struct soc_camera_format_xlate *xlate; > struct v4l2_pix_format *pix = &f->fmt.pix; > @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct soc_camera_device > *icd, if (mf->code != xlate->code) > return -EINVAL; > > - /* Enable PM and peripheral clock before operate isi registers */ > - pm_runtime_get_sync(ici->v4l2_dev.dev); > - > - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); > - > - pm_runtime_put(ici->v4l2_dev.dev); > - > - if (ret < 0) > - return ret; > - > pix->width = mf->width; > pix->height = mf->height; > pix->field = mf->field;
HI, Laurent On 7/31/2015 10:37 PM, Laurent Pinchart wrote: > Hi Josh, > > Thank you for the patch. > > On Wednesday 17 June 2015 18:39:39 Josh Wu wrote: >> As in set_fmt() function we only need to know which format is been set, >> we don't need to access the ISI hardware in this moment. >> >> So move the configure_geometry(), which access the ISI hardware, to >> start_streaming() will make code more consistent and simpler. >> >> Signed-off-by: Josh Wu <josh.wu@atmel.com> >> --- >> >> drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------ >> 1 file changed, 5 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c >> b/drivers/media/platform/soc_camera/atmel-isi.c index 8bc40ca..b01086d >> 100644 >> --- a/drivers/media/platform/soc_camera/atmel-isi.c >> +++ b/drivers/media/platform/soc_camera/atmel-isi.c >> @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, >> unsigned int count) /* Disable all interrupts */ >> isi_writel(isi, ISI_INTDIS, (u32)~0UL); >> >> + ret = configure_geometry(isi, icd->user_width, icd->user_height, >> + icd->current_fmt->code); > I would also make configure_geometry a void function, as the only failure case > really can't occur. I think this case can be reached if user require a RGB565 format to capture and sensor also support RGB565 format. As atmel-isi driver will provide RGB565 support via the pass-through mode (maybe we need re-consider this part). So that will cause the configure_geometry() returns an error since it found the bus format is not Y8 or YUV422. In my opinion, we should not change configure_geometry()'s return type, until we add a insanity format check before we call configure_geometry() in future. > > Apart from that, > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Thanks for the review. Best Regards, Josh Wu > >> + if (ret < 0) >> + return ret; >> + >> spin_lock_irq(&isi->lock); >> /* Clear any pending interrupt */ >> isi_readl(isi, ISI_STATUS); >> @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue *q, >> static int isi_camera_set_fmt(struct soc_camera_device *icd, >> struct v4l2_format *f) >> { >> - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); >> - struct atmel_isi *isi = ici->priv; >> struct v4l2_subdev *sd = soc_camera_to_subdev(icd); >> const struct soc_camera_format_xlate *xlate; >> struct v4l2_pix_format *pix = &f->fmt.pix; >> @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct soc_camera_device >> *icd, if (mf->code != xlate->code) >> return -EINVAL; >> >> - /* Enable PM and peripheral clock before operate isi registers */ >> - pm_runtime_get_sync(ici->v4l2_dev.dev); >> - >> - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); >> - >> - pm_runtime_put(ici->v4l2_dev.dev); >> - >> - if (ret < 0) >> - return ret; >> - >> pix->width = mf->width; >> pix->height = mf->height; >> pix->field = mf->field; -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Josh, On Monday 03 August 2015 11:56:01 Josh Wu wrote: > On 7/31/2015 10:37 PM, Laurent Pinchart wrote: > > On Wednesday 17 June 2015 18:39:39 Josh Wu wrote: > >> As in set_fmt() function we only need to know which format is been set, > >> we don't need to access the ISI hardware in this moment. > >> > >> So move the configure_geometry(), which access the ISI hardware, to > >> start_streaming() will make code more consistent and simpler. > >> > >> Signed-off-by: Josh Wu <josh.wu@atmel.com> > >> --- > >> > >> drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------ > >> 1 file changed, 5 insertions(+), 12 deletions(-) > >> > >> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c > >> b/drivers/media/platform/soc_camera/atmel-isi.c index 8bc40ca..b01086d > >> 100644 > >> --- a/drivers/media/platform/soc_camera/atmel-isi.c > >> +++ b/drivers/media/platform/soc_camera/atmel-isi.c > >> @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, > >> unsigned int count) /* Disable all interrupts */ > >> > >> isi_writel(isi, ISI_INTDIS, (u32)~0UL); > >> > >> + ret = configure_geometry(isi, icd->user_width, icd->user_height, > >> + icd->current_fmt->code); > > > > I would also make configure_geometry a void function, as the only failure > > case really can't occur. > > I think this case can be reached if user require a RGB565 format to > capture and sensor also support RGB565 format. > As atmel-isi driver will provide RGB565 support via the pass-through > mode (maybe we need re-consider this part). > > So that will cause the configure_geometry() returns an error since it > found the bus format is not Y8 or YUV422. > > In my opinion, we should not change configure_geometry()'s return type, > until we add a insanity format check before we call configure_geometry() > in future. It will really confuse the user if S_FMT accepts a format but STREAMON fails due to the format being unsupported. Could that be fixed by defaulting to a known supported format in S_FMT if the requested format isn't support ? You could then remove the error check in configure_geometry(). > > Apart from that, > > > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Thanks for the review. > > Best Regards, > Josh Wu > > >> + if (ret < 0) > >> + return ret; > >> + > >> > >> spin_lock_irq(&isi->lock); > >> /* Clear any pending interrupt */ > >> isi_readl(isi, ISI_STATUS); > >> > >> @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue > >> *q, static int isi_camera_set_fmt(struct soc_camera_device *icd, > >> > >> struct v4l2_format *f) > >> > >> { > >> > >> - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); > >> - struct atmel_isi *isi = ici->priv; > >> > >> struct v4l2_subdev *sd = soc_camera_to_subdev(icd); > >> const struct soc_camera_format_xlate *xlate; > >> struct v4l2_pix_format *pix = &f->fmt.pix; > >> > >> @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct > >> soc_camera_device > >> *icd, if (mf->code != xlate->code) > >> > >> return -EINVAL; > >> > >> - /* Enable PM and peripheral clock before operate isi registers */ > >> - pm_runtime_get_sync(ici->v4l2_dev.dev); > >> - > >> - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); > >> - > >> - pm_runtime_put(ici->v4l2_dev.dev); > >> - > >> - if (ret < 0) > >> - return ret; > >> - > >> > >> pix->width = mf->width; > >> pix->height = mf->height; > >> pix->field = mf->field;
Hi, Laurent On 8/3/2015 9:27 PM, Laurent Pinchart wrote: > Hi Josh, > > On Monday 03 August 2015 11:56:01 Josh Wu wrote: >> On 7/31/2015 10:37 PM, Laurent Pinchart wrote: >>> On Wednesday 17 June 2015 18:39:39 Josh Wu wrote: >>>> As in set_fmt() function we only need to know which format is been set, >>>> we don't need to access the ISI hardware in this moment. >>>> >>>> So move the configure_geometry(), which access the ISI hardware, to >>>> start_streaming() will make code more consistent and simpler. >>>> >>>> Signed-off-by: Josh Wu <josh.wu@atmel.com> >>>> --- >>>> >>>> drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------ >>>> 1 file changed, 5 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c >>>> b/drivers/media/platform/soc_camera/atmel-isi.c index 8bc40ca..b01086d >>>> 100644 >>>> --- a/drivers/media/platform/soc_camera/atmel-isi.c >>>> +++ b/drivers/media/platform/soc_camera/atmel-isi.c >>>> @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, >>>> unsigned int count) /* Disable all interrupts */ >>>> >>>> isi_writel(isi, ISI_INTDIS, (u32)~0UL); >>>> >>>> + ret = configure_geometry(isi, icd->user_width, icd->user_height, >>>> + icd->current_fmt->code); >>> I would also make configure_geometry a void function, as the only failure >>> case really can't occur. >> I think this case can be reached if user require a RGB565 format to >> capture and sensor also support RGB565 format. >> As atmel-isi driver will provide RGB565 support via the pass-through >> mode (maybe we need re-consider this part). >> >> So that will cause the configure_geometry() returns an error since it >> found the bus format is not Y8 or YUV422. >> >> In my opinion, we should not change configure_geometry()'s return type, >> until we add a insanity format check before we call configure_geometry() >> in future. > It will really confuse the user if S_FMT accepts a format but STREAMON fails > due to the format being unsupported. Could that be fixed by defaulting to a > known supported format in S_FMT if the requested format isn't support ? yes, it's the right way to go. > You > could then remove the error check in configure_geometry(). So I will send a v2 patches, which will add one more patch to add insanity check on the S_FMT and remove the error check code in configure_geometry(). And for this patch in v2, I will add your reviewed-by tag. Is that Okay for you? Best Regards, Josh Wu >>> Apart from that, >>> >>> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >> Thanks for the review. >> >> Best Regards, >> Josh Wu >> >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> >>>> spin_lock_irq(&isi->lock); >>>> /* Clear any pending interrupt */ >>>> isi_readl(isi, ISI_STATUS); >>>> >>>> @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue >>>> *q, static int isi_camera_set_fmt(struct soc_camera_device *icd, >>>> >>>> struct v4l2_format *f) >>>> >>>> { >>>> >>>> - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); >>>> - struct atmel_isi *isi = ici->priv; >>>> >>>> struct v4l2_subdev *sd = soc_camera_to_subdev(icd); >>>> const struct soc_camera_format_xlate *xlate; >>>> struct v4l2_pix_format *pix = &f->fmt.pix; >>>> >>>> @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct >>>> soc_camera_device >>>> *icd, if (mf->code != xlate->code) >>>> >>>> return -EINVAL; >>>> >>>> - /* Enable PM and peripheral clock before operate isi registers */ >>>> - pm_runtime_get_sync(ici->v4l2_dev.dev); >>>> - >>>> - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); >>>> - >>>> - pm_runtime_put(ici->v4l2_dev.dev); >>>> - >>>> - if (ret < 0) >>>> - return ret; >>>> - >>>> >>>> pix->width = mf->width; >>>> pix->height = mf->height; >>>> pix->field = mf->field; -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Josh, On Wed, 17 Jun 2015, Josh Wu wrote: > As in set_fmt() function we only need to know which format is been set, > we don't need to access the ISI hardware in this moment. > > So move the configure_geometry(), which access the ISI hardware, to > start_streaming() will make code more consistent and simpler. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > --- > > drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) > > diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c > index 8bc40ca..b01086d 100644 > --- a/drivers/media/platform/soc_camera/atmel-isi.c > +++ b/drivers/media/platform/soc_camera/atmel-isi.c > @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) > /* Disable all interrupts */ > isi_writel(isi, ISI_INTDIS, (u32)~0UL); > > + ret = configure_geometry(isi, icd->user_width, icd->user_height, > + icd->current_fmt->code); > + if (ret < 0) > + return ret; No. Firstly, you'd have to pm_runtime_put() here if you fail. Secondly I think it's better to fail earlier - at S_FMT, than here. Not accessing the hardware in S_FMT is a good idea, but I'd at least do all the checking there. So, maybe add a "u32 cfg2_cr" field to struct atmel_isi, calculate it in S_FMT but only write to the hardware in start_streaming()? Thanks Guennadi > + > spin_lock_irq(&isi->lock); > /* Clear any pending interrupt */ > isi_readl(isi, ISI_STATUS); > @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue *q, > static int isi_camera_set_fmt(struct soc_camera_device *icd, > struct v4l2_format *f) > { > - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); > - struct atmel_isi *isi = ici->priv; > struct v4l2_subdev *sd = soc_camera_to_subdev(icd); > const struct soc_camera_format_xlate *xlate; > struct v4l2_pix_format *pix = &f->fmt.pix; > @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct soc_camera_device *icd, > if (mf->code != xlate->code) > return -EINVAL; > > - /* Enable PM and peripheral clock before operate isi registers */ > - pm_runtime_get_sync(ici->v4l2_dev.dev); > - > - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); > - > - pm_runtime_put(ici->v4l2_dev.dev); > - > - if (ret < 0) > - return ret; > - > pix->width = mf->width; > pix->height = mf->height; > pix->field = mf->field; > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Yep, I see the thread and updates to this patch now, please, ignore this mail, sorry. Thanks Guennadi On Sun, 30 Aug 2015, Guennadi Liakhovetski wrote: > Hi Josh, > > On Wed, 17 Jun 2015, Josh Wu wrote: > > > As in set_fmt() function we only need to know which format is been set, > > we don't need to access the ISI hardware in this moment. > > > > So move the configure_geometry(), which access the ISI hardware, to > > start_streaming() will make code more consistent and simpler. > > > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > > --- > > > > drivers/media/platform/soc_camera/atmel-isi.c | 17 +++++------------ > > 1 file changed, 5 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c > > index 8bc40ca..b01086d 100644 > > --- a/drivers/media/platform/soc_camera/atmel-isi.c > > +++ b/drivers/media/platform/soc_camera/atmel-isi.c > > @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) > > /* Disable all interrupts */ > > isi_writel(isi, ISI_INTDIS, (u32)~0UL); > > > > + ret = configure_geometry(isi, icd->user_width, icd->user_height, > > + icd->current_fmt->code); > > + if (ret < 0) > > + return ret; > > No. Firstly, you'd have to pm_runtime_put() here if you fail. Secondly I > think it's better to fail earlier - at S_FMT, than here. Not accessing the > hardware in S_FMT is a good idea, but I'd at least do all the checking > there. So, maybe add a "u32 cfg2_cr" field to struct atmel_isi, calculate > it in S_FMT but only write to the hardware in start_streaming()? > > Thanks > Guennadi > > > + > > spin_lock_irq(&isi->lock); > > /* Clear any pending interrupt */ > > isi_readl(isi, ISI_STATUS); > > @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue *q, > > static int isi_camera_set_fmt(struct soc_camera_device *icd, > > struct v4l2_format *f) > > { > > - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); > > - struct atmel_isi *isi = ici->priv; > > struct v4l2_subdev *sd = soc_camera_to_subdev(icd); > > const struct soc_camera_format_xlate *xlate; > > struct v4l2_pix_format *pix = &f->fmt.pix; > > @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct soc_camera_device *icd, > > if (mf->code != xlate->code) > > return -EINVAL; > > > > - /* Enable PM and peripheral clock before operate isi registers */ > > - pm_runtime_get_sync(ici->v4l2_dev.dev); > > - > > - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); > > - > > - pm_runtime_put(ici->v4l2_dev.dev); > > - > > - if (ret < 0) > > - return ret; > > - > > pix->width = mf->width; > > pix->height = mf->height; > > pix->field = mf->field; > > -- > > 1.9.1 > > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c index 8bc40ca..b01086d 100644 --- a/drivers/media/platform/soc_camera/atmel-isi.c +++ b/drivers/media/platform/soc_camera/atmel-isi.c @@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) /* Disable all interrupts */ isi_writel(isi, ISI_INTDIS, (u32)~0UL); + ret = configure_geometry(isi, icd->user_width, icd->user_height, + icd->current_fmt->code); + if (ret < 0) + return ret; + spin_lock_irq(&isi->lock); /* Clear any pending interrupt */ isi_readl(isi, ISI_STATUS); @@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue *q, static int isi_camera_set_fmt(struct soc_camera_device *icd, struct v4l2_format *f) { - struct soc_camera_host *ici = to_soc_camera_host(icd->parent); - struct atmel_isi *isi = ici->priv; struct v4l2_subdev *sd = soc_camera_to_subdev(icd); const struct soc_camera_format_xlate *xlate; struct v4l2_pix_format *pix = &f->fmt.pix; @@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct soc_camera_device *icd, if (mf->code != xlate->code) return -EINVAL; - /* Enable PM and peripheral clock before operate isi registers */ - pm_runtime_get_sync(ici->v4l2_dev.dev); - - ret = configure_geometry(isi, pix->width, pix->height, xlate->code); - - pm_runtime_put(ici->v4l2_dev.dev); - - if (ret < 0) - return ret; - pix->width = mf->width; pix->height = mf->height; pix->field = mf->field;