Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
include/uapi/linux/media-bus-format.h between various commits from
Linus' tree and various commits from the v4l-dvb tree.
I reported this previously against the drm tree but some fo the numbers
have changed.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell [email protected]
diff --cc include/uapi/linux/media-bus-format.h
index 73c78f18a328,d391893064a0..000000000000
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@@ -45,18 -43,14 +45,20 @@@
#define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007
#define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008
#define MEDIA_BUS_FMT_RGB666_1X18 0x1009
+#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015
+#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010
+#define MEDIA_BUS_FMT_BGR888_1X24 0x1013
+#define MEDIA_BUS_FMT_GBR888_1X24 0x1014
+ #define MEDIA_BUS_FMT_RBG888_1X24 0x100e
#define MEDIA_BUS_FMT_RGB888_1X24 0x100a
#define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b
#define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c
+#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011
+#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012
#define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d
+ #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f
-/* YUV (including grey) - next is 0x2025 */
+/* YUV (including grey) - next is 0x2026 */
#define MEDIA_BUS_FMT_Y8_1X8 0x2001
#define MEDIA_BUS_FMT_UV8_1X8 0x2015
#define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002
@@@ -82,13 -80,7 +88,14 @@@
#define MEDIA_BUS_FMT_VYUY10_1X20 0x201b
#define MEDIA_BUS_FMT_YUYV10_1X20 0x200d
#define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
+#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_VUY8_1X24 0x2024
#define MEDIA_BUS_FMT_UYVY12_1X24 0x2020
#define MEDIA_BUS_FMT_VYUY12_1X24 0x2021
#define MEDIA_BUS_FMT_YUYV12_1X24 0x2022
Hi Stephen,
On Tuesday 21 April 2015 11:54:09 Stephen Rothwell wrote:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> include/uapi/linux/media-bus-format.h between various commits from
> Linus' tree and various commits from the v4l-dvb tree.
>
> I reported this previously against the drm tree but some fo the numbers
> have changed.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell [email protected]
>
> diff --cc include/uapi/linux/media-bus-format.h
> index 73c78f18a328,d391893064a0..000000000000
> --- a/include/uapi/linux/media-bus-format.h
> +++ b/include/uapi/linux/media-bus-format.h
> @@@ -45,18 -43,14 +45,20 @@@
> #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007
> #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008
> #define MEDIA_BUS_FMT_RGB666_1X18 0x1009
> +#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015
> +#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010
> +#define MEDIA_BUS_FMT_BGR888_1X24 0x1013
> +#define MEDIA_BUS_FMT_GBR888_1X24 0x1014
> + #define MEDIA_BUS_FMT_RBG888_1X24 0x100e
> #define MEDIA_BUS_FMT_RGB888_1X24 0x100a
> #define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b
> #define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c
> +#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011
> +#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012
> #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d
> + #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f
>
> -/* YUV (including grey) - next is 0x2025 */
> +/* YUV (including grey) - next is 0x2026 */
> #define MEDIA_BUS_FMT_Y8_1X8 0x2001
> #define MEDIA_BUS_FMT_UV8_1X8 0x2015
> #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002
> @@@ -82,13 -80,7 +88,14 @@@
> #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b
> #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d
> #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
> +#define MEDIA_BUS_FMT_YUV8_1X24 0x2025
The above line is correct.
> +#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.
> + #define MEDIA_BUS_FMT_VUY8_1X24 0x2024
> #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020
> #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021
> #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022
--
Regards,
Laurent Pinchart
Hi Laurent,
On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart <[email protected]> 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.
--
Cheers,
Stephen Rothwell [email protected]
Em Tue, 21 Apr 2015 18:02:43 +1000
Stephen Rothwell <[email protected]> escreveu:
> Hi Laurent,
>
> On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart <[email protected]> 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.
Thanks,
Mauro
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 ?
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
--
Regards,
Laurent Pinchart
Em Tue, 21 Apr 2015 15:38:02 +0300
Laurent Pinchart <[email protected]> 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
>
>
Am Dienstag, den 21.04.2015, 10:12 -0300 schrieb Mauro Carvalho Chehab:
> Em Tue, 21 Apr 2015 15:38:02 +0300
> Laurent Pinchart <[email protected]> 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.
Thanks, this looks good to me.
One small thing, I noticed the MEDIA_BUS_FMT_VUY8_1X24 documentation has
the wrong value: It says 0x201a, but it should be 0x2024. This was
already wrong in the original patch: 2dca0551e4e2 ("[media] v4l: Add
VUY8 24 bits bus format").
regards
Philipp