[v5,07/13] include: media-bus-formats: Add Mali-C55 mbus codes
diff mbox series

Message ID 20241107105846.52287-8-dan.scally@ideasonboard.com
State Superseded
Headers show
Series
  • Miscellaneous Mali-C55 Pipeline Fixes
Related show

Commit Message

Dan Scally Nov. 7, 2024, 10:58 a.m. UTC 
From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

Add media bus codes introduced by the Mali C55 ISP support to describe
the 20-bit input formats supported by the ISP.

Add the following formats

- MEDIA_BUS_FMT_RGB202020_1X60

  for processed input formats
  https://lore.kernel.org/linux-media/20240529152858.183799-2-dan.scally@ideasonboard.com/

- MEDIA_BUS_FMT_SBGGR20_1X20
  MEDIA_BUS_FMT_SGBRG20_1X20
  MEDIA_BUS_FMT_SGRBG20_1X20
  MEDIA_BUS_FMT_SRGGB20_1X20

  for the RAW bayer input format
  https://lore.kernel.org/linux-media/20240529152858.183799-3-dan.scally@ideasonboard.com/

Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
---
Changes in v5:

	- None

 include/linux/media-bus-format.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Laurent Pinchart Nov. 12, 2024, 6:32 a.m. UTC | #1 
Hi Dan,

Thank you for the patch.

On Thu, Nov 07, 2024 at 10:58:40AM +0000, Daniel Scally wrote:
> From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> 
> Add media bus codes introduced by the Mali C55 ISP support to describe
> the 20-bit input formats supported by the ISP.
> 
> Add the following formats
> 
> - MEDIA_BUS_FMT_RGB202020_1X60
> 
>   for processed input formats
>   https://lore.kernel.org/linux-media/20240529152858.183799-2-dan.scally@ideasonboard.com/
> 
> - MEDIA_BUS_FMT_SBGGR20_1X20
>   MEDIA_BUS_FMT_SGBRG20_1X20
>   MEDIA_BUS_FMT_SGRBG20_1X20
>   MEDIA_BUS_FMT_SRGGB20_1X20
> 
>   for the RAW bayer input format
>   https://lore.kernel.org/linux-media/20240529152858.183799-3-dan.scally@ideasonboard.com/

Please explain in the commit message that these manual changes are
temporary, until the C55 kernel driver gets merged, at which point the
media bus codes will be provided by upstream kernel headers.

With that,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
> ---
> Changes in v5:
> 
> 	- None
> 
>  include/linux/media-bus-format.h | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
> index d4c1d991..b6acf8c8 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	0x1026 */
> +/* RGB - next is	0x1027 */
>  #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
> @@ -72,6 +72,7 @@
>  #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
>  
>  /* YUV (including grey) - next is	0x202f */
>  #define MEDIA_BUS_FMT_Y8_1X8			0x2001
> @@ -121,7 +122,7 @@
>  #define MEDIA_BUS_FMT_YUV16_1X48		0x202a
>  #define MEDIA_BUS_FMT_UYYVYY16_0_5X48		0x202b
>  
> -/* Bayer - next is	0x3021 */
> +/* Bayer - next is	0x3025 */
>  #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
>  #define MEDIA_BUS_FMT_SGBRG8_1X8		0x3013
>  #define MEDIA_BUS_FMT_SGRBG8_1X8		0x3002
> @@ -154,6 +155,10 @@
>  #define MEDIA_BUS_FMT_SGBRG16_1X16		0x301e
>  #define MEDIA_BUS_FMT_SGRBG16_1X16		0x301f
>  #define MEDIA_BUS_FMT_SRGGB16_1X16		0x3020
> +#define MEDIA_BUS_FMT_SBGGR20_1X20		0x3021
> +#define MEDIA_BUS_FMT_SGBRG20_1X20		0x3022
> +#define MEDIA_BUS_FMT_SGRBG20_1X20		0x3023
> +#define MEDIA_BUS_FMT_SRGGB20_1X20		0x3024
>  
>  /* JPEG compressed formats - next is	0x4002 */
>  #define MEDIA_BUS_FMT_JPEG_1X8			0x4001
Dan Scally Nov. 13, 2024, 3:47 p.m. UTC | #2 
Hi Laurent

On 12/11/2024 06:32, Laurent Pinchart wrote:
> Hi Dan,
>
> Thank you for the patch.
>
> On Thu, Nov 07, 2024 at 10:58:40AM +0000, Daniel Scally wrote:
>> From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
>>
>> Add media bus codes introduced by the Mali C55 ISP support to describe
>> the 20-bit input formats supported by the ISP.
>>
>> Add the following formats
>>
>> - MEDIA_BUS_FMT_RGB202020_1X60
>>
>>    for processed input formats
>>    https://lore.kernel.org/linux-media/20240529152858.183799-2-dan.scally@ideasonboard.com/
>>
>> - MEDIA_BUS_FMT_SBGGR20_1X20
>>    MEDIA_BUS_FMT_SGBRG20_1X20
>>    MEDIA_BUS_FMT_SGRBG20_1X20
>>    MEDIA_BUS_FMT_SRGGB20_1X20
>>
>>    for the RAW bayer input format
>>    https://lore.kernel.org/linux-media/20240529152858.183799-3-dan.scally@ideasonboard.com/
> Please explain in the commit message that these manual changes are
> temporary, until the C55 kernel driver gets merged, at which point the
> media bus codes will be provided by upstream kernel headers.

This isn't one of the auto-generated files, as far as I know the scripts won't update this map so 
it'd have to be done manually at some stage.


Dan

>
> With that,
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
>> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
>> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
>> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
>> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
>> ---
>> Changes in v5:
>>
>> 	- None
>>
>>   include/linux/media-bus-format.h | 9 +++++++--
>>   1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
>> index d4c1d991..b6acf8c8 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	0x1026 */
>> +/* RGB - next is	0x1027 */
>>   #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
>> @@ -72,6 +72,7 @@
>>   #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
>>   
>>   /* YUV (including grey) - next is	0x202f */
>>   #define MEDIA_BUS_FMT_Y8_1X8			0x2001
>> @@ -121,7 +122,7 @@
>>   #define MEDIA_BUS_FMT_YUV16_1X48		0x202a
>>   #define MEDIA_BUS_FMT_UYYVYY16_0_5X48		0x202b
>>   
>> -/* Bayer - next is	0x3021 */
>> +/* Bayer - next is	0x3025 */
>>   #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
>>   #define MEDIA_BUS_FMT_SGBRG8_1X8		0x3013
>>   #define MEDIA_BUS_FMT_SGRBG8_1X8		0x3002
>> @@ -154,6 +155,10 @@
>>   #define MEDIA_BUS_FMT_SGBRG16_1X16		0x301e
>>   #define MEDIA_BUS_FMT_SGRBG16_1X16		0x301f
>>   #define MEDIA_BUS_FMT_SRGGB16_1X16		0x3020
>> +#define MEDIA_BUS_FMT_SBGGR20_1X20		0x3021
>> +#define MEDIA_BUS_FMT_SGBRG20_1X20		0x3022
>> +#define MEDIA_BUS_FMT_SGRBG20_1X20		0x3023
>> +#define MEDIA_BUS_FMT_SRGGB20_1X20		0x3024
>>   
>>   /* JPEG compressed formats - next is	0x4002 */
>>   #define MEDIA_BUS_FMT_JPEG_1X8			0x4001
Laurent Pinchart Nov. 13, 2024, 4:04 p.m. UTC | #3 
On Wed, Nov 13, 2024 at 03:47:14PM +0000, Daniel Scally wrote:
> Hi Laurent
> 
> On 12/11/2024 06:32, Laurent Pinchart wrote:
> > Hi Dan,
> >
> > Thank you for the patch.
> >
> > On Thu, Nov 07, 2024 at 10:58:40AM +0000, Daniel Scally wrote:
> >> From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> >>
> >> Add media bus codes introduced by the Mali C55 ISP support to describe
> >> the 20-bit input formats supported by the ISP.
> >>
> >> Add the following formats
> >>
> >> - MEDIA_BUS_FMT_RGB202020_1X60
> >>
> >>    for processed input formats
> >>    https://lore.kernel.org/linux-media/20240529152858.183799-2-dan.scally@ideasonboard.com/
> >>
> >> - MEDIA_BUS_FMT_SBGGR20_1X20
> >>    MEDIA_BUS_FMT_SGBRG20_1X20
> >>    MEDIA_BUS_FMT_SGRBG20_1X20
> >>    MEDIA_BUS_FMT_SRGGB20_1X20
> >>
> >>    for the RAW bayer input format
> >>    https://lore.kernel.org/linux-media/20240529152858.183799-3-dan.scally@ideasonboard.com/
> >
> > Please explain in the commit message that these manual changes are
> > temporary, until the C55 kernel driver gets merged, at which point the
> > media bus codes will be provided by upstream kernel headers.
> 
> This isn't one of the auto-generated files, as far as I know the scripts won't update this map so 
> it'd have to be done manually at some stage.

This file isn't auto-generated, but it's imported from the Linux kernel
using the utils/update-kernel-headers.sh script. It's fine adding
formats manually before drivers are merged in mainline, but eventually
the same change should come from the mainline kernel.

> > With that,
> >
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >
> >> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
> >> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> >> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> >> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
> >> ---
> >> Changes in v5:
> >>
> >> 	- None
> >>
> >>   include/linux/media-bus-format.h | 9 +++++++--
> >>   1 file changed, 7 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
> >> index d4c1d991..b6acf8c8 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	0x1026 */
> >> +/* RGB - next is	0x1027 */
> >>   #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
> >> @@ -72,6 +72,7 @@
> >>   #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
> >>   
> >>   /* YUV (including grey) - next is	0x202f */
> >>   #define MEDIA_BUS_FMT_Y8_1X8			0x2001
> >> @@ -121,7 +122,7 @@
> >>   #define MEDIA_BUS_FMT_YUV16_1X48		0x202a
> >>   #define MEDIA_BUS_FMT_UYYVYY16_0_5X48		0x202b
> >>   
> >> -/* Bayer - next is	0x3021 */
> >> +/* Bayer - next is	0x3025 */
> >>   #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
> >>   #define MEDIA_BUS_FMT_SGBRG8_1X8		0x3013
> >>   #define MEDIA_BUS_FMT_SGRBG8_1X8		0x3002
> >> @@ -154,6 +155,10 @@
> >>   #define MEDIA_BUS_FMT_SGBRG16_1X16		0x301e
> >>   #define MEDIA_BUS_FMT_SGRBG16_1X16		0x301f
> >>   #define MEDIA_BUS_FMT_SRGGB16_1X16		0x3020
> >> +#define MEDIA_BUS_FMT_SBGGR20_1X20		0x3021
> >> +#define MEDIA_BUS_FMT_SGBRG20_1X20		0x3022
> >> +#define MEDIA_BUS_FMT_SGRBG20_1X20		0x3023
> >> +#define MEDIA_BUS_FMT_SRGGB20_1X20		0x3024
> >>   
> >>   /* JPEG compressed formats - next is	0x4002 */
> >>   #define MEDIA_BUS_FMT_JPEG_1X8			0x4001
Dan Scally Nov. 14, 2024, 7:37 a.m. UTC | #4 
Hi Laurent

On 13/11/2024 16:04, Laurent Pinchart wrote:
> On Wed, Nov 13, 2024 at 03:47:14PM +0000, Daniel Scally wrote:
>> Hi Laurent
>>
>> On 12/11/2024 06:32, Laurent Pinchart wrote:
>>> Hi Dan,
>>>
>>> Thank you for the patch.
>>>
>>> On Thu, Nov 07, 2024 at 10:58:40AM +0000, Daniel Scally wrote:
>>>> From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
>>>>
>>>> Add media bus codes introduced by the Mali C55 ISP support to describe
>>>> the 20-bit input formats supported by the ISP.
>>>>
>>>> Add the following formats
>>>>
>>>> - MEDIA_BUS_FMT_RGB202020_1X60
>>>>
>>>>     for processed input formats
>>>>     https://lore.kernel.org/linux-media/20240529152858.183799-2-dan.scally@ideasonboard.com/
>>>>
>>>> - MEDIA_BUS_FMT_SBGGR20_1X20
>>>>     MEDIA_BUS_FMT_SGBRG20_1X20
>>>>     MEDIA_BUS_FMT_SGRBG20_1X20
>>>>     MEDIA_BUS_FMT_SRGGB20_1X20
>>>>
>>>>     for the RAW bayer input format
>>>>     https://lore.kernel.org/linux-media/20240529152858.183799-3-dan.scally@ideasonboard.com/
>>> Please explain in the commit message that these manual changes are
>>> temporary, until the C55 kernel driver gets merged, at which point the
>>> media bus codes will be provided by upstream kernel headers.
>> This isn't one of the auto-generated files, as far as I know the scripts won't update this map so
>> it'd have to be done manually at some stage.
> This file isn't auto-generated, but it's imported from the Linux kernel
> using the utils/update-kernel-headers.sh script. It's fine adding
> formats manually before drivers are merged in mainline, but eventually
> the same change should come from the mainline kernel.

For some reason I thought that this comment was sent for the next patch. Of course you are right, 
sorry for the noise


Thanks

Dan

>
>>> With that,
>>>
>>> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>>
>>>> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
>>>> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
>>>> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
>>>> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
>>>> ---
>>>> Changes in v5:
>>>>
>>>> 	- None
>>>>
>>>>    include/linux/media-bus-format.h | 9 +++++++--
>>>>    1 file changed, 7 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
>>>> index d4c1d991..b6acf8c8 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	0x1026 */
>>>> +/* RGB - next is	0x1027 */
>>>>    #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
>>>> @@ -72,6 +72,7 @@
>>>>    #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
>>>>    
>>>>    /* YUV (including grey) - next is	0x202f */
>>>>    #define MEDIA_BUS_FMT_Y8_1X8			0x2001
>>>> @@ -121,7 +122,7 @@
>>>>    #define MEDIA_BUS_FMT_YUV16_1X48		0x202a
>>>>    #define MEDIA_BUS_FMT_UYYVYY16_0_5X48		0x202b
>>>>    
>>>> -/* Bayer - next is	0x3021 */
>>>> +/* Bayer - next is	0x3025 */
>>>>    #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
>>>>    #define MEDIA_BUS_FMT_SGBRG8_1X8		0x3013
>>>>    #define MEDIA_BUS_FMT_SGRBG8_1X8		0x3002
>>>> @@ -154,6 +155,10 @@
>>>>    #define MEDIA_BUS_FMT_SGBRG16_1X16		0x301e
>>>>    #define MEDIA_BUS_FMT_SGRBG16_1X16		0x301f
>>>>    #define MEDIA_BUS_FMT_SRGGB16_1X16		0x3020
>>>> +#define MEDIA_BUS_FMT_SBGGR20_1X20		0x3021
>>>> +#define MEDIA_BUS_FMT_SGBRG20_1X20		0x3022
>>>> +#define MEDIA_BUS_FMT_SGRBG20_1X20		0x3023
>>>> +#define MEDIA_BUS_FMT_SRGGB20_1X20		0x3024
>>>>    
>>>>    /* JPEG compressed formats - next is	0x4002 */
>>>>    #define MEDIA_BUS_FMT_JPEG_1X8			0x4001

Patch
diff mbox series 

diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
index d4c1d991..b6acf8c8 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	0x1026 */
+/* RGB - next is	0x1027 */
 #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
@@ -72,6 +72,7 @@ 
 #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
 
 /* YUV (including grey) - next is	0x202f */
 #define MEDIA_BUS_FMT_Y8_1X8			0x2001
@@ -121,7 +122,7 @@ 
 #define MEDIA_BUS_FMT_YUV16_1X48		0x202a
 #define MEDIA_BUS_FMT_UYYVYY16_0_5X48		0x202b
 
-/* Bayer - next is	0x3021 */
+/* Bayer - next is	0x3025 */
 #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
 #define MEDIA_BUS_FMT_SGBRG8_1X8		0x3013
 #define MEDIA_BUS_FMT_SGRBG8_1X8		0x3002
@@ -154,6 +155,10 @@ 
 #define MEDIA_BUS_FMT_SGBRG16_1X16		0x301e
 #define MEDIA_BUS_FMT_SGRBG16_1X16		0x301f
 #define MEDIA_BUS_FMT_SRGGB16_1X16		0x3020
+#define MEDIA_BUS_FMT_SBGGR20_1X20		0x3021
+#define MEDIA_BUS_FMT_SGBRG20_1X20		0x3022
+#define MEDIA_BUS_FMT_SGRBG20_1X20		0x3023
+#define MEDIA_BUS_FMT_SRGGB20_1X20		0x3024
 
 /* JPEG compressed formats - next is	0x4002 */
 #define MEDIA_BUS_FMT_JPEG_1X8			0x4001