[PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"

[PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"

[Neil Armstrong]

This reverts commit a3f98bb22cbfaaf67717e156f79e2bfeb42d4cac.

Patch "Documentation/gpu/meson: Remove link to meson_canvas.c" was
incorrectly applied on the wrong branch not containing the fixed
commit 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 Documentation/gpu/meson.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
index b9e2f9aa3bd8..479f6f51a13b 100644
--- a/Documentation/gpu/meson.rst
+++ b/Documentation/gpu/meson.rst
@@ -42,6 +42,12 @@ 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
 ============
 
-- 
2.21.0

Re: [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"

[Sean Paul]

On Thu, Apr 04, 2019 at 04:43:42PM +0200, Neil Armstrong wrote:
> This reverts commit a3f98bb22cbfaaf67717e156f79e2bfeb42d4cac.
> 
> Patch "Documentation/gpu/meson: Remove link to meson_canvas.c" was
> incorrectly applied on the wrong branch not containing the fixed
> commit 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

Acked-by: Sean Paul <sean@poorly.run>

and I'll leave this for Maxime to apply if he so chooses.

Sean

> ---
>  Documentation/gpu/meson.rst | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/gpu/meson.rst b/Documentation/gpu/meson.rst
> index b9e2f9aa3bd8..479f6f51a13b 100644
> --- a/Documentation/gpu/meson.rst
> +++ b/Documentation/gpu/meson.rst
> @@ -42,6 +42,12 @@ 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
>  ============
>  
> -- 
> 2.21.0
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS

Re: [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 695 bytes --]

On Thu, Apr 04, 2019 at 10:52:02AM -0400, Sean Paul wrote:
> On Thu, Apr 04, 2019 at 04:43:42PM +0200, Neil Armstrong wrote:
> > This reverts commit a3f98bb22cbfaaf67717e156f79e2bfeb42d4cac.
> >
> > Patch "Documentation/gpu/meson: Remove link to meson_canvas.c" was
> > incorrectly applied on the wrong branch not containing the fixed
> > commit 2bf6b5b0e374 ("drm/meson: exclusively use the canvas provider module")
> >
> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>
> Acked-by: Sean Paul <sean@poorly.run>
>
> and I'll leave this for Maxime to apply if he so chooses.

Applied, thanks!
Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]