Documentation/gpu/meson: Remove link to meson_canvas.c

Commit Message

Sean Paul April 3, 2019, 8:56 p.m. UTC

From: Sean Paul <[e-mail]>

The file was removed in the below patch and is causing this error:
WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code

Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
Cc: Maxime Jourdan <[e-mail]>
Cc: Neil Armstrong <[e-mail]>
Cc: Kevin Hilman <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Signed-off-by: Sean Paul <[e-mail]>
---
 Documentation/gpu/meson.rst | 6 ------
 1 file changed, 6 deletions(-)

Comments

Neil Armstrong April 4, 2019, 6:56 a.m. UTC | #1

On 03/04/2019 22:56, Sean Paul wrote:
> From: Sean Paul <[e-mail]>
> 
> The file was removed in the below patch and is causing this error:
> WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code
> 
> Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
> Cc: Maxime Jourdan <[e-mail]>
> Cc: Neil Armstrong <[e-mail]>
> Cc: Kevin Hilman <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: [e-mail]
> Signed-off-by: Sean Paul <[e-mail]>
> ---
>  Documentation/gpu/meson.rst | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
> index 479f6f51a13b..b9e2f9aa3bd8 100644
> --- a/Documentation/gpu/meson.rst
> +++ b/Documentation/gpu/meson.rst
> @@ -42,12 +42,6 @@ Video Encoder
>  .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
>     :doc: Video Encoder
>  
> -Video Canvas Management
> -=======================
> -
> -.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
> -   :doc: Canvas
> -
>  Video Clocks
>  ============
>  
> 

Acked-by: Neil Armstrong <[e-mail]>

Neil Armstrong April 4, 2019, 8:28 a.m. UTC | #2

On 04/04/2019 08:56, Neil Armstrong wrote:
> On 03/04/2019 22:56, Sean Paul wrote:
>> From: Sean Paul <[e-mail]>
>>
>> The file was removed in the below patch and is causing this error:
>> WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code
>>
>> Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
>> Cc: Maxime Jourdan <[e-mail]>
>> Cc: Neil Armstrong <[e-mail]>
>> Cc: Kevin Hilman <[e-mail]>
>> Cc: [e-mail]
>> Cc: [e-mail]
>> Cc: [e-mail]
>> Signed-off-by: Sean Paul <[e-mail]>
>> ---
>>  Documentation/gpu/meson.rst | 6 ------
>>  1 file changed, 6 deletions(-)
>>
>> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
>> index 479f6f51a13b..b9e2f9aa3bd8 100644
>> --- a/Documentation/gpu/meson.rst
>> +++ b/Documentation/gpu/meson.rst
>> @@ -42,12 +42,6 @@ Video Encoder
>>  .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
>>     :doc: Video Encoder
>>  
>> -Video Canvas Management
>> -=======================
>> -
>> -.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
>> -   :doc: Canvas
>> -
>>  Video Clocks
>>  ============
>>  
>>
> 
> Acked-by: Neil Armstrong <[e-mail]>
> 

Applied to drm-misc-fixes

Neil

Sean Paul April 4, 2019, 2:31 p.m. UTC | #3

On Thu, Apr 04, 2019 at 10:28:29AM +0200, Neil Armstrong wrote:
> On 04/04/2019 08:56, Neil Armstrong wrote:
> > On 03/04/2019 22:56, Sean Paul wrote:
> >> From: Sean Paul <[e-mail]>
> >>
> >> The file was removed in the below patch and is causing this error:
> >> WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code
> >>
> >> Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
> >> Cc: Maxime Jourdan <[e-mail]>
> >> Cc: Neil Armstrong <[e-mail]>
> >> Cc: Kevin Hilman <[e-mail]>
> >> Cc: [e-mail]
> >> Cc: [e-mail]
> >> Cc: [e-mail]
> >> Signed-off-by: Sean Paul <[e-mail]>
> >> ---
> >>  Documentation/gpu/meson.rst | 6 ------
> >>  1 file changed, 6 deletions(-)
> >>
> >> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
> >> index 479f6f51a13b..b9e2f9aa3bd8 100644
> >> --- a/Documentation/gpu/meson.rst
> >> +++ b/Documentation/gpu/meson.rst
> >> @@ -42,12 +42,6 @@ Video Encoder
> >>  .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
> >>     :doc: Video Encoder
> >>  
> >> -Video Canvas Management
> >> -=======================
> >> -
> >> -.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
> >> -   :doc: Canvas
> >> -
> >>  Video Clocks
> >>  ============
> >>  
> >>
> > 
> > Acked-by: Neil Armstrong <[e-mail]>
> > 
> 
> Applied to drm-misc-fixes

Hmm, the commit referenced in the Fixes line hasn't landed in -fixes yet, it's
in -next. So the fix has landed before the bug :(

I'll ping mripard on irc and see what he wants to do about this.

Sean

> 
> Neil

Maxime Jourdan April 5, 2019, 11:43 a.m. UTC | #4

Hi Sean,
On Wed, Apr 3, 2019 at 10:56 PM Sean Paul <[e-mail]> wrote:
>
> From: Sean Paul <[e-mail]>
>
> The file was removed in the below patch and is causing this error:
> WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code
>
> Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
> Cc: Maxime Jourdan <[e-mail]>
> Cc: Neil Armstrong <[e-mail]>
> Cc: Kevin Hilman <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Cc: [e-mail]
> Signed-off-by: Sean Paul <[e-mail]>
> ---
>  Documentation/gpu/meson.rst | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
> index 479f6f51a13b..b9e2f9aa3bd8 100644
> --- a/Documentation/gpu/meson.rst
> +++ b/Documentation/gpu/meson.rst
> @@ -42,12 +42,6 @@ Video Encoder
>  .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
>     :doc: Video Encoder
>
> -Video Canvas Management
> -=======================
> -
> -.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
> -   :doc: Canvas
> -
>  Video Clocks
>  ============
>
> --
> Sean Paul, Software Engineer, Google / Chromium OS
>

Thanks for the patch, I missed that completely!

Maxime

Neil Armstrong April 5, 2019, 12:14 p.m. UTC | #5

On 04/04/2019 16:31, Sean Paul wrote:
> On Thu, Apr 04, 2019 at 10:28:29AM +0200, Neil Armstrong wrote:
>> On 04/04/2019 08:56, Neil Armstrong wrote:
>>> On 03/04/2019 22:56, Sean Paul wrote:
>>>> From: Sean Paul <[e-mail]>
>>>>
>>>> The file was removed in the below patch and is causing this error:
>>>> WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code
>>>>
>>>> Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
>>>> Cc: Maxime Jourdan <[e-mail]>
>>>> Cc: Neil Armstrong <[e-mail]>
>>>> Cc: Kevin Hilman <[e-mail]>
>>>> Cc: [e-mail]
>>>> Cc: [e-mail]
>>>> Cc: [e-mail]
>>>> Signed-off-by: Sean Paul <[e-mail]>
>>>> ---
>>>>  Documentation/gpu/meson.rst | 6 ------
>>>>  1 file changed, 6 deletions(-)
>>>>
>>>> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
>>>> index 479f6f51a13b..b9e2f9aa3bd8 100644
>>>> --- a/Documentation/gpu/meson.rst
>>>> +++ b/Documentation/gpu/meson.rst
>>>> @@ -42,12 +42,6 @@ Video Encoder
>>>>  .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
>>>>     :doc: Video Encoder
>>>>  
>>>> -Video Canvas Management
>>>> -=======================
>>>> -
>>>> -.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
>>>> -   :doc: Canvas
>>>> -
>>>>  Video Clocks
>>>>  ============
>>>>  
>>>>
>>>
>>> Acked-by: Neil Armstrong <[e-mail]>
>>>
>>
>> Applied to drm-misc-fixes
> 
> Hmm, the commit referenced in the Fixes line hasn't landed in -fixes yet, it's
> in -next. So the fix has landed before the bug :(

Seems I'll still need to apply it to -next !

Neil

> 
> I'll ping mripard on irc and see what he wants to do about this.
> 
> Sean
> 
>>
>> Neil
>

Sean Paul April 5, 2019, 12:57 p.m. UTC | #6

On Fri, Apr 05, 2019 at 02:14:35PM +0200, Neil Armstrong wrote:
> On 04/04/2019 16:31, Sean Paul wrote:
> > On Thu, Apr 04, 2019 at 10:28:29AM +0200, Neil Armstrong wrote:
> >> On 04/04/2019 08:56, Neil Armstrong wrote:
> >>> On 03/04/2019 22:56, Sean Paul wrote:
> >>>> From: Sean Paul <[e-mail]>
> >>>>
> >>>> The file was removed in the below patch and is causing this error:
> >>>> WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function Canvas ../drivers/gpu/drm/meson/meson_canvas.c' failed with return code
> >>>>
> >>>> Fixes: 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
> >>>> Cc: Maxime Jourdan <[e-mail]>
> >>>> Cc: Neil Armstrong <[e-mail]>
> >>>> Cc: Kevin Hilman <[e-mail]>
> >>>> Cc: [e-mail]
> >>>> Cc: [e-mail]
> >>>> Cc: [e-mail]
> >>>> Signed-off-by: Sean Paul <[e-mail]>
> >>>> ---
> >>>>  Documentation/gpu/meson.rst | 6 ------
> >>>>  1 file changed, 6 deletions(-)
> >>>>
> >>>> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
> >>>> index 479f6f51a13b..b9e2f9aa3bd8 100644
> >>>> --- a/Documentation/gpu/meson.rst
> >>>> +++ b/Documentation/gpu/meson.rst
> >>>> @@ -42,12 +42,6 @@ Video Encoder
> >>>>  .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
> >>>>     :doc: Video Encoder
> >>>>  
> >>>> -Video Canvas Management
> >>>> -=======================
> >>>> -
> >>>> -.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
> >>>> -   :doc: Canvas
> >>>> -
> >>>>  Video Clocks
> >>>>  ============
> >>>>  
> >>>>
> >>>
> >>> Acked-by: Neil Armstrong <[e-mail]>
> >>>
> >>
> >> Applied to drm-misc-fixes
> > 
> > Hmm, the commit referenced in the Fixes line hasn't landed in -fixes yet, it's
> > in -next. So the fix has landed before the bug :(
> 
> Seems I'll still need to apply it to -next !

I've just applied it, thanks for staying on top of this.

Sean

> 
> Neil
> 
> > 
> > I'll ping mripard on irc and see what he wants to do about this.
> > 
> > Sean
> > 
> >>
> >> Neil
> > 
>

Patch

diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
index 479f6f51a13b..b9e2f9aa3bd8 100644
--- a/Documentation/gpu/meson.rst
+++ b/Documentation/gpu/meson.rst
@@ -42,12 +42,6 @@  Video Encoder
 .. kernel-doc:: drivers/gpu/drm/meson/meson_venc.c
    :doc: Video Encoder
 
-Video Canvas Management
-=======================
-
-.. kernel-doc:: drivers/gpu/drm/meson/meson_canvas.c
-   :doc: Canvas
-
 Video Clocks
 ============