summaryrefslogtreecommitdiff
path: root/Documentation/gpu
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-05-28 10:38:59 +0300
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-05-28 10:39:08 +0300
commit4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch)
tree4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /Documentation/gpu
parentcf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff)
parent14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff)
downloadlinux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.tar.xz
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'Documentation/gpu')
-rw-r--r--Documentation/gpu/drm-kms-helpers.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
index 14102ae035dc..0fe726a6ee67 100644
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -181,6 +181,12 @@ Panel Helper Reference
.. kernel-doc:: drivers/gpu/drm/drm_panel_orientation_quirks.c
:export:
+HDCP Helper Functions Reference
+===============================
+
+.. kernel-doc:: drivers/gpu/drm/drm_hdcp.c
+ :export:
+
Display Port Helper Functions Reference
=======================================