Skip to contentSkip to conversation

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

PATCH Applied Neil Armstrong 3 participants 3 messages Apr 4, 2019 – Apr 5, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

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

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")

---
 Documentation/gpu/meson.rst | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/gpu/meson.rst +6 -0
index b9e2f9aa3bd8..479f6f51a13b 100644
@@ -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
 ============
 
Signature · 1 line
2.21.0
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · 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")

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

Sean

Quoted 24 lines
---
 Documentation/gpu/meson.rst | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/gpu/meson.rst +6 -0
index b9e2f9aa3bd8..479f6f51a13b 100644
@@ -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
 ============
 
Signature · 1 line
2.21.0
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
#2 lore raw
Quoted 7 lines · Sean Paul
Quoted 6 lines · 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")

Quoted 5 lines
Quoted 1 line

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