From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Philipp Zabel <p.zabel@pengutronix.de>,
Dave Airlie <airlied@redhat.com>,
Boris Brezillion <boris.brezillon@free-electrons.com>,
Hyun Kwon <hyun.kwon@xilinx.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Tue, 21 Apr 2015 10:12:07 -0300 [thread overview]
Message-ID: <20150421101207.4616e284@recife.lan> (raw)
In-Reply-To: <1908360.Iueb02OAJf@avalon>
Em Tue, 21 Apr 2015 15:38:02 +0300
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> Hi Mauro,
>
> On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote:
> > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu:
> > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote:
> > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
> > > > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
> > > > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
> > > > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
> > > > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
> > > > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
> > > >
> > > > The above 6 lines introduce duplicate defines, you can remove them.
> > >
> > > OK, thanks, done for tomorrow. Though hopefully all this will be
> > > resolved soon.
> >
> > I think that the best is for me to merge from the DRM branch that Linus
> > picked, and solve the conflict there.
> >
> > This way, it should be a way easier for Linus to pick it, and not
> > manually solve those conflicts with are not trivial.
> >
> > Laurent/Philipp,
> >
> > Please double-check if everything went fine on my conflict solving.
> > I'm pushing it at branch "fixes" at the media development tree:
> > git://linuxtv.org/media_tree.git fixes
> >
> > In any case, I double-checked that it is compiling and it is producing the
> > media DocBook.
> >
> > PS.: I intend to send this latter today for being merged upstream.
>
> The numerical values are correct, but the order of the YUV formats got messed
> up. Could you squash the following change into the merge ?
Sure. Squashed.
Regards,
Mauro
>
> diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
> index d66463b..2588ad7 100644
> --- a/Documentation/DocBook/media/v4l/subdev-formats.xml
> +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
> @@ -3432,6 +3432,43 @@ see <xref linkend="colorspaces" />.</entry>
> <entry>y<subscript>1</subscript></entry>
> <entry>y<subscript>0</subscript></entry>
> </row>
> + <row id="MEDIA-BUS-FMT-YUV8-1X24">
> + <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
> + <entry>0x2025</entry>
> + <entry></entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>-</entry>
> + <entry>y<subscript>7</subscript></entry>
> + <entry>y<subscript>6</subscript></entry>
> + <entry>y<subscript>5</subscript></entry>
> + <entry>y<subscript>4</subscript></entry>
> + <entry>y<subscript>3</subscript></entry>
> + <entry>y<subscript>2</subscript></entry>
> + <entry>y<subscript>1</subscript></entry>
> + <entry>y<subscript>0</subscript></entry>
> + <entry>u<subscript>7</subscript></entry>
> + <entry>u<subscript>6</subscript></entry>
> + <entry>u<subscript>5</subscript></entry>
> + <entry>u<subscript>4</subscript></entry>
> + <entry>u<subscript>3</subscript></entry>
> + <entry>u<subscript>2</subscript></entry>
> + <entry>u<subscript>1</subscript></entry>
> + <entry>u<subscript>0</subscript></entry>
> + <entry>v<subscript>7</subscript></entry>
> + <entry>v<subscript>6</subscript></entry>
> + <entry>v<subscript>5</subscript></entry>
> + <entry>v<subscript>4</subscript></entry>
> + <entry>v<subscript>3</subscript></entry>
> + <entry>v<subscript>2</subscript></entry>
> + <entry>v<subscript>1</subscript></entry>
> + <entry>v<subscript>0</subscript></entry>
> + </row>
> <row id="MEDIA-BUS-FMT-UYVY12-1X24">
> <entry>MEDIA_BUS_FMT_UYVY12_1X24</entry>
> <entry>0x2020</entry>
> @@ -3672,43 +3709,6 @@ see <xref linkend="colorspaces" />.</entry>
> <entry>u<subscript>1</subscript></entry>
> <entry>u<subscript>0</subscript></entry>
> </row>
> - <row id="MEDIA-BUS-FMT-YUV8-1X24">
> - <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
> - <entry>0x2025</entry>
> - <entry></entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>-</entry>
> - <entry>y<subscript>7</subscript></entry>
> - <entry>y<subscript>6</subscript></entry>
> - <entry>y<subscript>5</subscript></entry>
> - <entry>y<subscript>4</subscript></entry>
> - <entry>y<subscript>3</subscript></entry>
> - <entry>y<subscript>2</subscript></entry>
> - <entry>y<subscript>1</subscript></entry>
> - <entry>y<subscript>0</subscript></entry>
> - <entry>u<subscript>7</subscript></entry>
> - <entry>u<subscript>6</subscript></entry>
> - <entry>u<subscript>5</subscript></entry>
> - <entry>u<subscript>4</subscript></entry>
> - <entry>u<subscript>3</subscript></entry>
> - <entry>u<subscript>2</subscript></entry>
> - <entry>u<subscript>1</subscript></entry>
> - <entry>u<subscript>0</subscript></entry>
> - <entry>v<subscript>7</subscript></entry>
> - <entry>v<subscript>6</subscript></entry>
> - <entry>v<subscript>5</subscript></entry>
> - <entry>v<subscript>4</subscript></entry>
> - <entry>v<subscript>3</subscript></entry>
> - <entry>v<subscript>2</subscript></entry>
> - <entry>v<subscript>1</subscript></entry>
> - <entry>v<subscript>0</subscript></entry>
> - </row>
> <row id="MEDIA-BUS-FMT-YUV10-1X30">
> <entry>MEDIA_BUS_FMT_YUV10_1X30</entry>
> <entry>0x2016</entry>
> diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
> index 3eeb8cc..190d491 100644
> --- a/include/uapi/linux/media-bus-format.h
> +++ b/include/uapi/linux/media-bus-format.h
> @@ -75,6 +75,10 @@
> #define MEDIA_BUS_FMT_YUYV10_2X10 0x200b
> #define MEDIA_BUS_FMT_YVYU10_2X10 0x200c
> #define MEDIA_BUS_FMT_Y12_1X12 0x2013
> +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
> +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
> +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
> +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
> #define MEDIA_BUS_FMT_UYVY8_1X16 0x200f
> #define MEDIA_BUS_FMT_VYUY8_1X16 0x2010
> #define MEDIA_BUS_FMT_YUYV8_1X16 0x2011
> @@ -86,16 +90,12 @@
> #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
> #define MEDIA_BUS_FMT_VUY8_1X24 0x2024
> #define MEDIA_BUS_FMT_YUV8_1X24 0x2025
> -#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
> -#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
> -#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
> -#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
> -#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
> -#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
> #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020
> #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021
> #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022
> #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023
> +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
> +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
>
> /* Bayer - next is 0x3019 */
> #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001
>
>
next prev parent reply other threads:[~2015-04-21 13:12 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-21 1:54 linux-next: manual merge of the v4l-dvb tree with Linus' tree Stephen Rothwell
2015-04-21 7:49 ` Laurent Pinchart
2015-04-21 8:02 ` Stephen Rothwell
2015-04-21 9:56 ` Mauro Carvalho Chehab
2015-04-21 12:38 ` Laurent Pinchart
2015-04-21 13:12 ` Mauro Carvalho Chehab [this message]
2015-04-21 13:36 ` Philipp Zabel
-- strict thread matches above, loose matches on Subject: below --
2021-10-01 0:33 Stephen Rothwell
2021-10-01 6:46 ` Sean Young
2019-06-24 1:36 Stephen Rothwell
2019-06-06 0:43 Stephen Rothwell
2019-05-23 23:21 Stephen Rothwell
2019-01-31 23:22 Stephen Rothwell
2019-01-31 23:27 ` Stephen Rothwell
2016-08-04 1:02 Stephen Rothwell
2015-09-07 23:20 Stephen Rothwell
2015-04-21 1:50 Stephen Rothwell
2015-04-10 3:53 Stephen Rothwell
2014-01-14 0:50 Stephen Rothwell
2013-08-29 2:48 Stephen Rothwell
2012-10-02 1:13 Stephen Rothwell
2012-06-19 1:29 Stephen Rothwell
2012-06-19 10:06 ` Jiri Kosina
2012-06-19 11:50 ` Hans de Goede
2012-06-19 11:52 ` Jiri Kosina
2011-07-29 3:17 Stephen Rothwell
2011-07-29 4:10 ` Mauro Carvalho Chehab
2011-07-29 7:29 ` Stephen Rothwell
2011-04-08 3:27 Stephen Rothwell
2011-03-22 1:00 Stephen Rothwell
2010-07-06 2:01 Stephen Rothwell
2010-05-13 1:52 Stephen Rothwell
2010-05-10 0:36 Stephen Rothwell
2010-05-11 23:23 ` Mauro Carvalho Chehab
2010-05-12 0:23 ` Stephen Rothwell
2010-05-10 0:32 Stephen Rothwell
2010-05-11 5:19 ` Hiremath, Vaibhav
2010-05-10 0:29 Stephen Rothwell
2010-04-07 1:00 Stephen Rothwell
2010-04-09 5:22 ` Mauro Carvalho Chehab
2010-04-09 7:13 ` Stephen Rothwell
2009-09-02 2:17 Stephen Rothwell
2009-09-03 2:12 ` Mauro Carvalho Chehab
2009-09-03 6:49 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150421101207.4616e284@recife.lan \
--to=mchehab@infradead.org \
--cc=airlied@redhat.com \
--cc=boris.brezillon@free-electrons.com \
--cc=hyun.kwon@xilinx.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).