Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1703900
| Path | csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Hans Verkuil <hverkuil@xs4all.nl> |
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v1 4/5] [media] stm32-dcmi: set default format at open() |
| Date | Fri, 04 Aug 2017 14:10:01 +0200 |
| Message-ID | <uaJAt-6MJ-9@gated-at.bofh.it> (permalink) |
| References | <u8anw-2mH-5@gated-at.bofh.it> <u8anw-2mH-13@gated-at.bofh.it> |
| User-Agent | Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=windows-1252 |
| Content-Transfer-Encoding | 7bit |
| X-Cmae-Envelope | MS4wfK2NcyFGZuSl41IR0vqqFo5nnHXd/QpFrhmHJWK0K5MVx18jD+wiN266pA9cS+nk4mwQuPeusVZxVfT953fIAQKUMCS/95GhaHd8MyMHIAIrqOhKSRHT E7dJSuK+jYrxYuQ1zEprtCTPZpgGcilntTcjW+SajTPal5JNgr6GeTZVox5kD1lAI3kZMkywreBhcxSH1uNyCRatt8saZM1d0njpcOFXxd8ghNfGUQO9/9b8 adeO+mzfzOiL7qlLqMTxMBwkvNT2gtUyP5SqSnvXsEA09sh/AUHklf2xiiTXypvgQh07VDuLQw75YLZWqUqARCcJIk1QOfaTMPfzv+THBXV2VPKMHGtdXt85 x0GmBnPcpNqq+tWYscxy/XlIod+qHG8ptKK6pwuHEj9ghMJtgffblPa9jyHjrgQgpd/11T+7gIhz+k6IP8PHPyQ7MsTDPp0dwe/D1+yrgpyZV8a1KiMbAJiE Gu9xPqJ3349MWpTD |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 100 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Benjamin Gaignard <benjamin.gaignard@linaro.org>, Yannick Fertre <yannick.fertre@st.com> |
| X-Original-Date | Fri, 4 Aug 2017 14:00:05 +0200 |
| X-Original-Message-ID | <a5a158b3-b502-d220-52bb-8138328c1773@xs4all.nl> |
| X-Original-References | <1501236302-18097-1-git-send-email-hugues.fruchet@st.com> <1501236302-18097-5-git-send-email-hugues.fruchet@st.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1703900 |
Show key headers only | View raw
On 28/07/17 12:05, Hugues Fruchet wrote:
> Ensure that we start with default pixel format and resolution
> when opening a new instance.
Why? The format is persistent in V4L2 and (re)opening the video device
shouldn't change the format.
Suppose you use v4l2-ctl to set up a format. E.g. v4l2-ctl -v width=320,height-240.
Now run v4l2-ctl -V to get the format and with this code it would suddenly be
back to the default!
You set up the default format in the dcmi_graph_notify_complete, but after that
it is only changed if userspace explicitly requests it.
Regards,
Hans
>
> Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
> ---
> drivers/media/platform/stm32/stm32-dcmi.c | 49 ++++++++++++++++++-------------
> 1 file changed, 28 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
> index 4733d1f..2be56b6 100644
> --- a/drivers/media/platform/stm32/stm32-dcmi.c
> +++ b/drivers/media/platform/stm32/stm32-dcmi.c
> @@ -890,6 +890,28 @@ static int dcmi_enum_frameintervals(struct file *file, void *fh,
> return 0;
> }
>
> +static int dcmi_set_default_fmt(struct stm32_dcmi *dcmi)
> +{
> + struct v4l2_format f = {
> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
> + .fmt.pix = {
> + .width = CIF_WIDTH,
> + .height = CIF_HEIGHT,
> + .field = V4L2_FIELD_NONE,
> + .pixelformat = dcmi->sd_formats[0]->fourcc,
> + },
> + };
> + int ret;
> +
> + ret = dcmi_try_fmt(dcmi, &f, NULL);
> + if (ret)
> + return ret;
> + dcmi->sd_format = dcmi->sd_formats[0];
> + dcmi->fmt = f;
> +
> + return 0;
> +}
> +
> static const struct of_device_id stm32_dcmi_of_match[] = {
> { .compatible = "st,stm32-dcmi"},
> { /* end node */ },
> @@ -916,7 +938,13 @@ static int dcmi_open(struct file *file)
> if (ret < 0 && ret != -ENOIOCTLCMD)
> goto fh_rel;
>
> + ret = dcmi_set_default_fmt(dcmi);
> + if (ret)
> + goto power_off;
> +
> ret = dcmi_set_fmt(dcmi, &dcmi->fmt);
> +
> +power_off:
> if (ret)
> v4l2_subdev_call(sd, core, s_power, 0);
> fh_rel:
> @@ -991,27 +1019,6 @@ static int dcmi_release(struct file *file)
> .read = vb2_fop_read,
> };
>
> -static int dcmi_set_default_fmt(struct stm32_dcmi *dcmi)
> -{
> - struct v4l2_format f = {
> - .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
> - .fmt.pix = {
> - .width = CIF_WIDTH,
> - .height = CIF_HEIGHT,
> - .field = V4L2_FIELD_NONE,
> - .pixelformat = dcmi->sd_formats[0]->fourcc,
> - },
> - };
> - int ret;
> -
> - ret = dcmi_try_fmt(dcmi, &f, NULL);
> - if (ret)
> - return ret;
> - dcmi->sd_format = dcmi->sd_formats[0];
> - dcmi->fmt = f;
> - return 0;
> -}
> -
> static const struct dcmi_format dcmi_formats[] = {
> {
> .fourcc = V4L2_PIX_FMT_RGB565,
>
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
Re: [PATCH v1 4/5] [media] stm32-dcmi: set default format at open() Hans Verkuil <hverkuil@xs4all.nl> - 2017-08-04 14:10 +0200
csiph-web