]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "Documentation/gpu/meson: Remove link to meson_canvas.c"
authorNeil Armstrong <narmstrong@baylibre.com>
Thu, 4 Apr 2019 14:43:42 +0000 (16:43 +0200)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Fri, 5 Apr 2019 08:43:10 +0000 (10:43 +0200)
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")

Acked-by: Sean Paul <sean@poorly.run>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190404144342.15238-1-narmstrong@baylibre.com
Documentation/gpu/meson.rst

index b9e2f9aa3bd803cd4a41c766044fc3a750fa757d..479f6f51a13b061f3de4e6d7345457043959cd95 100644 (file)
@@ -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
 ============