* [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"
@ 2019-04-04 14:43 Neil Armstrong
2019-04-04 14:52 ` Sean Paul
0 siblings, 1 reply; 3+ messages in thread
From: Neil Armstrong @ 2019-04-04 14:43 UTC (permalink / raw)
To: sean, dri-devel
Cc: maxime.ripard, linux-amlogic, linux-kernel, 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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"
2019-04-04 14:43 [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c" Neil Armstrong
@ 2019-04-04 14:52 ` Sean Paul
2019-04-05 8:43 ` Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: Sean Paul @ 2019-04-04 14:52 UTC (permalink / raw)
To: Neil Armstrong
Cc: maxime.ripard, linux-amlogic, sean, linux-kernel, dri-devel
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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"
2019-04-04 14:52 ` Sean Paul
@ 2019-04-05 8:43 ` Maxime Ripard
0 siblings, 0 replies; 3+ messages in thread
From: Maxime Ripard @ 2019-04-05 8:43 UTC (permalink / raw)
To: Sean Paul; +Cc: linux-amlogic, linux-kernel, dri-devel, Neil Armstrong
[-- Attachment #1.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 #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-05 8:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-04 14:43 [PATCH] Revert "Documentation/gpu/meson: Remove link to meson_canvas.c" Neil Armstrong
2019-04-04 14:52 ` Sean Paul
2019-04-05 8:43 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).