summaryrefslogtreecommitdiffstats
path: root/Documentation/gpu/meson.rst
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2019-04-04 16:43:42 +0200
committerMaxime Ripard <maxime.ripard@bootlin.com>2019-04-05 10:43:10 +0200
commit3df1af984b76bc50cdbedbdd69d3f69192269cfe (patch)
treeae296bf0447978d404ca24bf7aaf74d70a4583d3 /Documentation/gpu/meson.rst
parentDocumentation/gpu/meson: Remove link to meson_canvas.c (diff)
downloadlinux-3df1af984b76bc50cdbedbdd69d3f69192269cfe.tar.xz
linux-3df1af984b76bc50cdbedbdd69d3f69192269cfe.zip
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") 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
Diffstat (limited to '')
-rw-r--r--Documentation/gpu/meson.rst6
1 files changed, 6 insertions, 0 deletions
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
============