[v3,3/6] include: linux: media-bus-format.h: Update to v6.18
diff mbox series

Message ID 20251211-headers-update-v6-18-v3-3-31a54230a104@ideasonboard.com
State Accepted
Headers show
Series
  • include: linux: Update headers to Linux v6.18
Related show

Commit Message

Jacopo Mondi Dec. 11, 2025, 9:07 a.m. UTC 
Update media-bus-format.h to Linux kernel version v6.18.

Mainline has introduced two new media bus codes whose definition
conflicts with the downstream definition of
MEDIA_BUS_FMT_RGB202020_1X60.

Update the definition of MEDIA_BUS_FMT_RGB202020_1X60 not to conflict
with the newly added symbol.

MEDIA_BUS_FMT_RGB202020_1X60, which is used by the Mali C55 ISP,
will land in v6.19 with value 0x1029, so this change actually
aligns the downstream definition with the forthcoming upstream
support for Mali C55.

Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Acked-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/linux/media-bus-format.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Kieran Bingham Dec. 11, 2025, 7:33 p.m. UTC | #1 
Quoting Jacopo Mondi (2025-12-11 09:07:26)
> Update media-bus-format.h to Linux kernel version v6.18.
> 
> Mainline has introduced two new media bus codes whose definition
> conflicts with the downstream definition of
> MEDIA_BUS_FMT_RGB202020_1X60.
> 
> Update the definition of MEDIA_BUS_FMT_RGB202020_1X60 not to conflict
> with the newly added symbol.
> 
> MEDIA_BUS_FMT_RGB202020_1X60, which is used by the Mali C55 ISP,
> will land in v6.19 with value 0x1029, so this change actually
> aligns the downstream definition with the forthcoming upstream
> support for Mali C55.
> 
> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> Acked-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  include/linux/media-bus-format.h | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
> index bf467168d4651fc93459a943605865d6acf8091d..6903d9bb298b969a9c99199e4541c82ea11bbe5c 100644
> --- a/include/linux/media-bus-format.h
> +++ b/include/linux/media-bus-format.h
> @@ -34,7 +34,7 @@
>  
>  #define MEDIA_BUS_FMT_FIXED                    0x0001
>  
> -/* RGB - next is       0x1027 */
> +/* RGB - next is       0x1029 */
>  #define MEDIA_BUS_FMT_RGB444_1X12              0x1016
>  #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE      0x1001
>  #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE      0x1002
> @@ -68,11 +68,13 @@
>  #define MEDIA_BUS_FMT_ARGB8888_1X32            0x100d
>  #define MEDIA_BUS_FMT_RGB888_1X32_PADHI                0x100f
>  #define MEDIA_BUS_FMT_RGB101010_1X30           0x1018
> +#define MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG     0x1026
> +#define MEDIA_BUS_FMT_RGB101010_1X7X5_JEIDA    0x1027
>  #define MEDIA_BUS_FMT_RGB666_1X36_CPADLO       0x1020
>  #define MEDIA_BUS_FMT_RGB888_1X36_CPADLO       0x1021
>  #define MEDIA_BUS_FMT_RGB121212_1X36           0x1019
>  #define MEDIA_BUS_FMT_RGB161616_1X48           0x101a
> -#define MEDIA_BUS_FMT_RGB202020_1X60           0x1026
> +#define MEDIA_BUS_FMT_RGB202020_1X60           0x1029

What happened to 0x1028 ? or is that only in v6.19 but we don't care
about it to add it here ?

Otherwise,

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

>  
>  /* YUV (including grey) - next is      0x202f */
>  #define MEDIA_BUS_FMT_Y8_1X8                   0x2001
> 
> -- 
> 2.52.0
>
Jacopo Mondi Dec. 12, 2025, 8:39 a.m. UTC | #2 
Hi Kieran

On Thu, Dec 11, 2025 at 07:33:06PM +0000, Kieran Bingham wrote:
> Quoting Jacopo Mondi (2025-12-11 09:07:26)
> > Update media-bus-format.h to Linux kernel version v6.18.
> >
> > Mainline has introduced two new media bus codes whose definition
> > conflicts with the downstream definition of
> > MEDIA_BUS_FMT_RGB202020_1X60.
> >
> > Update the definition of MEDIA_BUS_FMT_RGB202020_1X60 not to conflict
> > with the newly added symbol.
> >
> > MEDIA_BUS_FMT_RGB202020_1X60, which is used by the Mali C55 ISP,
> > will land in v6.19 with value 0x1029, so this change actually
> > aligns the downstream definition with the forthcoming upstream
> > support for Mali C55.
> >
> > Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> > Acked-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  include/linux/media-bus-format.h | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
> > index bf467168d4651fc93459a943605865d6acf8091d..6903d9bb298b969a9c99199e4541c82ea11bbe5c 100644
> > --- a/include/linux/media-bus-format.h
> > +++ b/include/linux/media-bus-format.h
> > @@ -34,7 +34,7 @@
> >
> >  #define MEDIA_BUS_FMT_FIXED                    0x0001
> >
> > -/* RGB - next is       0x1027 */
> > +/* RGB - next is       0x1029 */
> >  #define MEDIA_BUS_FMT_RGB444_1X12              0x1016
> >  #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE      0x1001
> >  #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE      0x1002
> > @@ -68,11 +68,13 @@
> >  #define MEDIA_BUS_FMT_ARGB8888_1X32            0x100d
> >  #define MEDIA_BUS_FMT_RGB888_1X32_PADHI                0x100f
> >  #define MEDIA_BUS_FMT_RGB101010_1X30           0x1018
> > +#define MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG     0x1026
> > +#define MEDIA_BUS_FMT_RGB101010_1X7X5_JEIDA    0x1027
> >  #define MEDIA_BUS_FMT_RGB666_1X36_CPADLO       0x1020
> >  #define MEDIA_BUS_FMT_RGB888_1X36_CPADLO       0x1021
> >  #define MEDIA_BUS_FMT_RGB121212_1X36           0x1019
> >  #define MEDIA_BUS_FMT_RGB161616_1X48           0x101a
> > -#define MEDIA_BUS_FMT_RGB202020_1X60           0x1026
> > +#define MEDIA_BUS_FMT_RGB202020_1X60           0x1029
>
> What happened to 0x1028 ? or is that only in v6.19 but we don't care
> about it to add it here ?

Good catch.

I don't know where I got confused, probably by

/* RGB - next is       0x1029 */

and I mixed 0x1029 with 0x1028 ?

I should have used 0x1028, as that's what will be used in v6.19 as
well, sorry about that.

Fortunately we have quite careful reviewers, otherwise this could have
lead to subtle bugs hard to diagnose. Thank you!

>
> Otherwise,
>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
>
> >
> >  /* YUV (including grey) - next is      0x202f */
> >  #define MEDIA_BUS_FMT_Y8_1X8                   0x2001
> >
> > --
> > 2.52.0
> >

Patch
diff mbox series 

diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
index bf467168d4651fc93459a943605865d6acf8091d..6903d9bb298b969a9c99199e4541c82ea11bbe5c 100644
--- a/include/linux/media-bus-format.h
+++ b/include/linux/media-bus-format.h
@@ -34,7 +34,7 @@ 
 
 #define MEDIA_BUS_FMT_FIXED			0x0001
 
-/* RGB - next is	0x1027 */
+/* RGB - next is	0x1029 */
 #define MEDIA_BUS_FMT_RGB444_1X12		0x1016
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE	0x1001
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE	0x1002
@@ -68,11 +68,13 @@ 
 #define MEDIA_BUS_FMT_ARGB8888_1X32		0x100d
 #define MEDIA_BUS_FMT_RGB888_1X32_PADHI		0x100f
 #define MEDIA_BUS_FMT_RGB101010_1X30		0x1018
+#define MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG	0x1026
+#define MEDIA_BUS_FMT_RGB101010_1X7X5_JEIDA	0x1027
 #define MEDIA_BUS_FMT_RGB666_1X36_CPADLO	0x1020
 #define MEDIA_BUS_FMT_RGB888_1X36_CPADLO	0x1021
 #define MEDIA_BUS_FMT_RGB121212_1X36		0x1019
 #define MEDIA_BUS_FMT_RGB161616_1X48		0x101a
-#define MEDIA_BUS_FMT_RGB202020_1X60		0x1026
+#define MEDIA_BUS_FMT_RGB202020_1X60		0x1029
 
 /* YUV (including grey) - next is	0x202f */
 #define MEDIA_BUS_FMT_Y8_1X8			0x2001