summaryrefslogtreecommitdiff
path: root/Documentation/gpu
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2018-11-30 16:47:01 +0300
committerSean Paul <seanpaul@chromium.org>2018-11-30 16:47:01 +0300
commitf6d266c279c01708c2937849bae57210af952fa2 (patch)
tree4c618be7b9bcdcd67d541f2386b31324f2a80624 /Documentation/gpu
parent2c2853f7da33c72fa271edac520d36ae47097354 (diff)
parent167bfe534dc2de680ef706dbb903c9a7bfcb2dd8 (diff)
downloadlinux-f6d266c279c01708c2937849bae57210af952fa2.tar.xz
Merge drm/drm-next into drm-misc-next
Need to pick up the following patch to fix htmldocs build 167bfe534dc2 ("Documentation: drm: Remove dangling pointer from drm-mm.rst") Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'Documentation/gpu')
-rw-r--r--Documentation/gpu/drm-mm.rst3
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst
index d0f3c6b03200..54a696d961a7 100644
--- a/Documentation/gpu/drm-mm.rst
+++ b/Documentation/gpu/drm-mm.rst
@@ -79,9 +79,6 @@ count for the TTM, which will call your initialization function.
See the radeon_ttm.c file for an example of usage.
-.. kernel-doc:: drivers/gpu/drm/drm_global.c
- :export:
-
The Graphics Execution Manager (GEM)
====================================