diff mbox series

media: Fix building pdfdocs

Message ID 20230208082916.68377-1-tomi.valkeinen@ideasonboard.com (mailing list archive)
State New, archived
Headers show
Series media: Fix building pdfdocs | expand

Commit Message

Tomi Valkeinen Feb. 8, 2023, 8:29 a.m. UTC
Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
documatation for a few new RGB formats. For some reason these break the
pdfdocs build, even if the same style seems to work elsewhere in the
file.

Remove the trailing empty dash lines, which seems to fix the issue.

Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
Reported-by: Akira Yokosawa <akiyks@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---

Note: the offending patch was merged via drm tree, so we may want to
apply the fix to the drm tree also.

 Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
 1 file changed, 3 deletions(-)

Comments

Akira Yokosawa Feb. 8, 2023, 8:43 a.m. UTC | #1
On Wed,  8 Feb 2023 10:29:16 +0200, Tomi Valkeinen wrote:
> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
> documatation for a few new RGB formats. For some reason these break the
> pdfdocs build, even if the same style seems to work elsewhere in the
> file.
> 
> Remove the trailing empty dash lines, which seems to fix the issue.
> 
> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
> Reported-by: Akira Yokosawa <akiyks@gmail.com>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>

Tested-by: Akira Yokosawa <akiyks@gmail.com>

> ---
> 
> Note: the offending patch was merged via drm tree, so we may want to
> apply the fix to the drm tree also.
> 
>  Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> index d330aeb4d3eb..ea545ed1aeaa 100644
> --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> @@ -868,7 +868,6 @@ number of bits for each component.
>        - r\ :sub:`4`
>        - r\ :sub:`3`
>        - r\ :sub:`2`
> -      -
>      * .. _V4L2-PIX-FMT-RGBA1010102:
>  
>        - ``V4L2_PIX_FMT_RGBA1010102``
> @@ -909,7 +908,6 @@ number of bits for each component.
>        - r\ :sub:`4`
>        - r\ :sub:`3`
>        - r\ :sub:`2`
> -      -
>      * .. _V4L2-PIX-FMT-ARGB2101010:
>  
>        - ``V4L2_PIX_FMT_ARGB2101010``
> @@ -950,7 +948,6 @@ number of bits for each component.
>        - r\ :sub:`6`
>        - r\ :sub:`5`
>        - r\ :sub:`4`
> -      -
>  
>  .. raw:: latex
>
Laurent Pinchart Feb. 8, 2023, 9:11 a.m. UTC | #2
Hi Tomi,

Thank you for the patch.

On Wed, Feb 08, 2023 at 10:29:16AM +0200, Tomi Valkeinen wrote:
> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
> documatation for a few new RGB formats. For some reason these break the

s/documatation/documentation/

> pdfdocs build, even if the same style seems to work elsewhere in the
> file.
> 
> Remove the trailing empty dash lines, which seems to fix the issue.
> 
> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
> Reported-by: Akira Yokosawa <akiyks@gmail.com>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>

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

> ---
> 
> Note: the offending patch was merged via drm tree, so we may want to
> apply the fix to the drm tree also.

Sounds good to me. Mauro, could you ack this patch ?

>  Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> index d330aeb4d3eb..ea545ed1aeaa 100644
> --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> @@ -868,7 +868,6 @@ number of bits for each component.
>        - r\ :sub:`4`
>        - r\ :sub:`3`
>        - r\ :sub:`2`
> -      -
>      * .. _V4L2-PIX-FMT-RGBA1010102:
>  
>        - ``V4L2_PIX_FMT_RGBA1010102``
> @@ -909,7 +908,6 @@ number of bits for each component.
>        - r\ :sub:`4`
>        - r\ :sub:`3`
>        - r\ :sub:`2`
> -      -
>      * .. _V4L2-PIX-FMT-ARGB2101010:
>  
>        - ``V4L2_PIX_FMT_ARGB2101010``
> @@ -950,7 +948,6 @@ number of bits for each component.
>        - r\ :sub:`6`
>        - r\ :sub:`5`
>        - r\ :sub:`4`
> -      -
>  
>  .. raw:: latex
>
Mauro Carvalho Chehab Feb. 8, 2023, 11:17 a.m. UTC | #3
Em Wed, 8 Feb 2023 11:11:34 +0200
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:

> Hi Tomi,
> 
> Thank you for the patch.
> 
> On Wed, Feb 08, 2023 at 10:29:16AM +0200, Tomi Valkeinen wrote:
> > Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
> > documatation for a few new RGB formats. For some reason these break the  
> 
> s/documatation/documentation/
> 
> > pdfdocs build, even if the same style seems to work elsewhere in the
> > file.
> > 
> > Remove the trailing empty dash lines, which seems to fix the issue.
> > 
> > Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
> > Reported-by: Akira Yokosawa <akiyks@gmail.com>
> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>  
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> > ---
> > 
> > Note: the offending patch was merged via drm tree, so we may want to
> > apply the fix to the drm tree also.  
> 
> Sounds good to me. Mauro, could you ack this patch ?

Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org>

> 
> >  Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> > index d330aeb4d3eb..ea545ed1aeaa 100644
> > --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> > +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> > @@ -868,7 +868,6 @@ number of bits for each component.
> >        - r\ :sub:`4`
> >        - r\ :sub:`3`
> >        - r\ :sub:`2`
> > -      -
> >      * .. _V4L2-PIX-FMT-RGBA1010102:
> >  
> >        - ``V4L2_PIX_FMT_RGBA1010102``
> > @@ -909,7 +908,6 @@ number of bits for each component.
> >        - r\ :sub:`4`
> >        - r\ :sub:`3`
> >        - r\ :sub:`2`
> > -      -
> >      * .. _V4L2-PIX-FMT-ARGB2101010:
> >  
> >        - ``V4L2_PIX_FMT_ARGB2101010``
> > @@ -950,7 +948,6 @@ number of bits for each component.
> >        - r\ :sub:`6`
> >        - r\ :sub:`5`
> >        - r\ :sub:`4`
> > -      -
> >  
> >  .. raw:: latex
> >    
> 



Thanks,
Mauro
Tomi Valkeinen Feb. 9, 2023, 10:11 a.m. UTC | #4
Hi Daniel, Dave,

Could you pick this fix to drm-next? The offending commit is there, it 
was merged via Laurent's "[GIT PULL FOR v6.3] R-Car DU fixes and 
improvements".

I can also push this to drm-misc-fixes, but the offending commit is not 
there yet.

  Tomi

On 08/02/2023 13:17, Mauro Carvalho Chehab wrote:
> Em Wed, 8 Feb 2023 11:11:34 +0200
> Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> 
>> Hi Tomi,
>>
>> Thank you for the patch.
>>
>> On Wed, Feb 08, 2023 at 10:29:16AM +0200, Tomi Valkeinen wrote:
>>> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
>>> documatation for a few new RGB formats. For some reason these break the
>>
>> s/documatation/documentation/
>>
>>> pdfdocs build, even if the same style seems to work elsewhere in the
>>> file.
>>>
>>> Remove the trailing empty dash lines, which seems to fix the issue.
>>>
>>> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
>>> Reported-by: Akira Yokosawa <akiyks@gmail.com>
>>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
>>
>> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>>
>>> ---
>>>
>>> Note: the offending patch was merged via drm tree, so we may want to
>>> apply the fix to the drm tree also.
>>
>> Sounds good to me. Mauro, could you ack this patch ?
> 
> Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> 
>>
>>>   Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
>>>   1 file changed, 3 deletions(-)
>>>
>>> diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
>>> index d330aeb4d3eb..ea545ed1aeaa 100644
>>> --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
>>> +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
>>> @@ -868,7 +868,6 @@ number of bits for each component.
>>>         - r\ :sub:`4`
>>>         - r\ :sub:`3`
>>>         - r\ :sub:`2`
>>> -      -
>>>       * .. _V4L2-PIX-FMT-RGBA1010102:
>>>   
>>>         - ``V4L2_PIX_FMT_RGBA1010102``
>>> @@ -909,7 +908,6 @@ number of bits for each component.
>>>         - r\ :sub:`4`
>>>         - r\ :sub:`3`
>>>         - r\ :sub:`2`
>>> -      -
>>>       * .. _V4L2-PIX-FMT-ARGB2101010:
>>>   
>>>         - ``V4L2_PIX_FMT_ARGB2101010``
>>> @@ -950,7 +948,6 @@ number of bits for each component.
>>>         - r\ :sub:`6`
>>>         - r\ :sub:`5`
>>>         - r\ :sub:`4`
>>> -      -
>>>   
>>>   .. raw:: latex
>>>     
>>
> 
> 
> 
> Thanks,
> Mauro
Akira Yokosawa Feb. 21, 2023, 1:16 a.m. UTC | #5
On Thu, 9 Feb 2023 12:11:19 +0200, Tomi Valkeinen wrote:
> Hi Daniel, Dave,
> 
> Could you pick this fix to drm-next? The offending commit is there, it was merged via Laurent's "[GIT PULL FOR v6.3] R-Car DU fixes and improvements".
> 
> I can also push this to drm-misc-fixes, but the offending commit is not there yet.

Hi,

I don't see this fix in next-20230220.

I'd really appreciate it if it could be upstreamed during the current
merge window.

Does anybody care to pick this up?

        Thanks, Akira

> 
>  Tomi
> 
> On 08/02/2023 13:17, Mauro Carvalho Chehab wrote:
>> Em Wed, 8 Feb 2023 11:11:34 +0200
>> Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
>>
>>> Hi Tomi,
>>>
>>> Thank you for the patch.
>>>
>>> On Wed, Feb 08, 2023 at 10:29:16AM +0200, Tomi Valkeinen wrote:
>>>> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
>>>> documatation for a few new RGB formats. For some reason these break the
>>>
>>> s/documatation/documentation/
>>>
>>>> pdfdocs build, even if the same style seems to work elsewhere in the
>>>> file.
>>>>
>>>> Remove the trailing empty dash lines, which seems to fix the issue.
>>>>
>>>> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
>>>> Reported-by: Akira Yokosawa <akiyks@gmail.com>
>>>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
>>>
>>> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>>>
>>>> ---
>>>>
>>>> Note: the offending patch was merged via drm tree, so we may want to
>>>> apply the fix to the drm tree also.
>>>
>>> Sounds good to me. Mauro, could you ack this patch ?
>>
>> Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>>
>>>
>>>>   Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
>>>>   1 file changed, 3 deletions(-)
>>>>
>>>> diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
>>>> index d330aeb4d3eb..ea545ed1aeaa 100644
>>>> --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
>>>> +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
>>>> @@ -868,7 +868,6 @@ number of bits for each component.
>>>>         - r\ :sub:`4`
>>>>         - r\ :sub:`3`
>>>>         - r\ :sub:`2`
>>>> -      -
>>>>       * .. _V4L2-PIX-FMT-RGBA1010102:
>>>>           - ``V4L2_PIX_FMT_RGBA1010102``
>>>> @@ -909,7 +908,6 @@ number of bits for each component.
>>>>         - r\ :sub:`4`
>>>>         - r\ :sub:`3`
>>>>         - r\ :sub:`2`
>>>> -      -
>>>>       * .. _V4L2-PIX-FMT-ARGB2101010:
>>>>           - ``V4L2_PIX_FMT_ARGB2101010``
>>>> @@ -950,7 +948,6 @@ number of bits for each component.
>>>>         - r\ :sub:`6`
>>>>         - r\ :sub:`5`
>>>>         - r\ :sub:`4`
>>>> -      -
>>>>     .. raw:: latex
>>>>     
>>>
>>
>>
>>
>> Thanks,
>> Mauro
>
Akira Yokosawa Feb. 25, 2023, 11:39 p.m. UTC | #6
[+CC: Jon, linux-doc]

On Wed,  8 Feb 2023 10:29:16 +0200, Tomi Valkeinen wrote:
> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
> documatation for a few new RGB formats. For some reason these break the
> pdfdocs build, even if the same style seems to work elsewhere in the
> file.
> 
> Remove the trailing empty dash lines, which seems to fix the issue.
> 
> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
> Reported-by: Akira Yokosawa <akiyks@gmail.com>
Link: https://lore.kernel.org/r/12250823-8445-5854-dfb8-b92c0ff0851e@gmail.com/

> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
> 
> Note: the offending patch was merged via drm tree, so we may want to
> apply the fix to the drm tree also.

So, the offending commit is now in mainline without this fix...
I believe this build regression -- a real build error of "make pdfdocs"
-- should be fixed ASAP.

Tomi, Laurent has suggested a typo fix in the Changelog.
Can you respin ?

Or, Laurent, can you do the fix on your own?

Hopefully, the fix can make v6.3-rc1.

        Thanks, Akira

> 
>  Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> index d330aeb4d3eb..ea545ed1aeaa 100644
> --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> @@ -868,7 +868,6 @@ number of bits for each component.
>        - r\ :sub:`4`
>        - r\ :sub:`3`
>        - r\ :sub:`2`
> -      -
>      * .. _V4L2-PIX-FMT-RGBA1010102:
>  
>        - ``V4L2_PIX_FMT_RGBA1010102``
> @@ -909,7 +908,6 @@ number of bits for each component.
>        - r\ :sub:`4`
>        - r\ :sub:`3`
>        - r\ :sub:`2`
> -      -
>      * .. _V4L2-PIX-FMT-ARGB2101010:
>  
>        - ``V4L2_PIX_FMT_ARGB2101010``
> @@ -950,7 +948,6 @@ number of bits for each component.
>        - r\ :sub:`6`
>        - r\ :sub:`5`
>        - r\ :sub:`4`
> -      -
>  
>  .. raw:: latex
>
Mauro Carvalho Chehab Feb. 26, 2023, 10:47 a.m. UTC | #7
Em Sun, 26 Feb 2023 08:39:32 +0900
Akira Yokosawa <akiyks@gmail.com> escreveu:

> [+CC: Jon, linux-doc]
> 
> On Wed,  8 Feb 2023 10:29:16 +0200, Tomi Valkeinen wrote:
> > Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
> > documatation for a few new RGB formats. For some reason these break the
> > pdfdocs build, even if the same style seems to work elsewhere in the
> > file.
> > 
> > Remove the trailing empty dash lines, which seems to fix the issue.
> > 
> > Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
> > Reported-by: Akira Yokosawa <akiyks@gmail.com>  
> Link: https://lore.kernel.org/r/12250823-8445-5854-dfb8-b92c0ff0851e@gmail.com/
> 
> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> > ---
> > 
> > Note: the offending patch was merged via drm tree, so we may want to
> > apply the fix to the drm tree also.  
> 
> So, the offending commit is now in mainline without this fix...
> I believe this build regression -- a real build error of "make pdfdocs"
> -- should be fixed ASAP.
> 
> Tomi, Laurent has suggested a typo fix in the Changelog.
> Can you respin ?
> 
> Or, Laurent, can you do the fix on your own?
> 
> Hopefully, the fix can make v6.3-rc1.

Better to wait for media PR to be handled. There were some changes at
the documentation that affected the patch. I guess the bug is gone.
If not, we'll need to rebase the patch.

Regards,
Mauro

> 
>         Thanks, Akira
> 
> > 
> >  Documentation/userspace-api/media/v4l/pixfmt-rgb.rst | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> > index d330aeb4d3eb..ea545ed1aeaa 100644
> > --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> > +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
> > @@ -868,7 +868,6 @@ number of bits for each component.
> >        - r\ :sub:`4`
> >        - r\ :sub:`3`
> >        - r\ :sub:`2`
> > -      -
> >      * .. _V4L2-PIX-FMT-RGBA1010102:
> >  
> >        - ``V4L2_PIX_FMT_RGBA1010102``
> > @@ -909,7 +908,6 @@ number of bits for each component.
> >        - r\ :sub:`4`
> >        - r\ :sub:`3`
> >        - r\ :sub:`2`
> > -      -
> >      * .. _V4L2-PIX-FMT-ARGB2101010:
> >  
> >        - ``V4L2_PIX_FMT_ARGB2101010``
> > @@ -950,7 +948,6 @@ number of bits for each component.
> >        - r\ :sub:`6`
> >        - r\ :sub:`5`
> >        - r\ :sub:`4`
> > -      -
> >  
> >  .. raw:: latex
> >    



Thanks,
Mauro
Akira Yokosawa Feb. 27, 2023, 12:06 p.m. UTC | #8
Hi Mauro,

On Sun, 26 Feb 2023 11:47:44 +0100, Mauro Carvalho Chehab wrote:
> Em Sun, 26 Feb 2023 08:39:32 +0900
> Akira Yokosawa <akiyks@gmail.com> escreveu:
> 
>> [+CC: Jon, linux-doc]
>>
>> On Wed,  8 Feb 2023 10:29:16 +0200, Tomi Valkeinen wrote:
>>> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
>>> documatation for a few new RGB formats. For some reason these break the
>>> pdfdocs build, even if the same style seems to work elsewhere in the
>>> file.
>>>
>>> Remove the trailing empty dash lines, which seems to fix the issue.
>>>
>>> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
>>> Reported-by: Akira Yokosawa <akiyks@gmail.com>  
>> Link: https://lore.kernel.org/r/12250823-8445-5854-dfb8-b92c0ff0851e@gmail.com/
>>
>>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
>>> ---
>>>
>>> Note: the offending patch was merged via drm tree, so we may want to
>>> apply the fix to the drm tree also.  
>>
>> So, the offending commit is now in mainline without this fix...
>> I believe this build regression -- a real build error of "make pdfdocs"
>> -- should be fixed ASAP.
>>
>> Tomi, Laurent has suggested a typo fix in the Changelog.
>> Can you respin ?
>>
>> Or, Laurent, can you do the fix on your own?
>>
>> Hopefully, the fix can make v6.3-rc1.
> 
> Better to wait for media PR to be handled. There were some changes at
> the documentation that affected the patch. I guess the bug is gone.

You mean the PR at https://lore.kernel.org/lkml/20230226114551.68480d44@coco.lan/ ?
Unfortunately, it has had no effect on this issue.

> If not, we'll need to rebase the patch.

There was no change in Documentation/userspace-api/media/v4l/pixfmt-rgb.rst,
so rebase is not needed.

Should this bug survive v6.3-rc1, I guess this fix could go through
media or doc tree.

Thoughts?

        Thanks, Akira

> 
> Regards,
> Mauro
>
Tomi Valkeinen Feb. 27, 2023, 1:42 p.m. UTC | #9
On 27/02/2023 14:06, Akira Yokosawa wrote:
> Hi Mauro,
> 
> On Sun, 26 Feb 2023 11:47:44 +0100, Mauro Carvalho Chehab wrote:
>> Em Sun, 26 Feb 2023 08:39:32 +0900
>> Akira Yokosawa <akiyks@gmail.com> escreveu:
>>
>>> [+CC: Jon, linux-doc]
>>>
>>> On Wed,  8 Feb 2023 10:29:16 +0200, Tomi Valkeinen wrote:
>>>> Commit 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats") added
>>>> documatation for a few new RGB formats. For some reason these break the
>>>> pdfdocs build, even if the same style seems to work elsewhere in the
>>>> file.
>>>>
>>>> Remove the trailing empty dash lines, which seems to fix the issue.
>>>>
>>>> Fixes: 8d0e3fc61abd ("media: Add 2-10-10-10 RGB formats")
>>>> Reported-by: Akira Yokosawa <akiyks@gmail.com>
>>> Link: https://lore.kernel.org/r/12250823-8445-5854-dfb8-b92c0ff0851e@gmail.com/
>>>
>>>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
>>>> ---
>>>>
>>>> Note: the offending patch was merged via drm tree, so we may want to
>>>> apply the fix to the drm tree also.
>>>
>>> So, the offending commit is now in mainline without this fix...
>>> I believe this build regression -- a real build error of "make pdfdocs"
>>> -- should be fixed ASAP.
>>>
>>> Tomi, Laurent has suggested a typo fix in the Changelog.
>>> Can you respin ?
>>>
>>> Or, Laurent, can you do the fix on your own?
>>>
>>> Hopefully, the fix can make v6.3-rc1.
>>
>> Better to wait for media PR to be handled. There were some changes at
>> the documentation that affected the patch. I guess the bug is gone.
> 
> You mean the PR at https://lore.kernel.org/lkml/20230226114551.68480d44@coco.lan/ ?
> Unfortunately, it has had no effect on this issue.
> 
>> If not, we'll need to rebase the patch.
> 
> There was no change in Documentation/userspace-api/media/v4l/pixfmt-rgb.rst,
> so rebase is not needed.
> 
> Should this bug survive v6.3-rc1, I guess this fix could go through
> media or doc tree.

This patch applies fine on top of current Linus' master.

As this is a media patch, and the offending commit is now in upstream, 
maybe it's better to get this fix in via linux-media rather than linux-drm.

Mauro, can you pick this up?

  Tomi
diff mbox series

Patch

diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
index d330aeb4d3eb..ea545ed1aeaa 100644
--- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
+++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
@@ -868,7 +868,6 @@  number of bits for each component.
       - r\ :sub:`4`
       - r\ :sub:`3`
       - r\ :sub:`2`
-      -
     * .. _V4L2-PIX-FMT-RGBA1010102:
 
       - ``V4L2_PIX_FMT_RGBA1010102``
@@ -909,7 +908,6 @@  number of bits for each component.
       - r\ :sub:`4`
       - r\ :sub:`3`
       - r\ :sub:`2`
-      -
     * .. _V4L2-PIX-FMT-ARGB2101010:
 
       - ``V4L2_PIX_FMT_ARGB2101010``
@@ -950,7 +948,6 @@  number of bits for each component.
       - r\ :sub:`6`
       - r\ :sub:`5`
       - r\ :sub:`4`
-      -
 
 .. raw:: latex