summaryrefslogtreecommitdiff
path: root/Documentation/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-23 10:15:55 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-23 10:15:55 +0300
commit628d4c46eef4fabe3ddbe07698577162c1cd5d41 (patch)
tree5e89f3deafd44c8b81543540c573af0c16dbb427 /Documentation/gpu
parent1e797f556c616a42f1e039b1ff1d3c58f61b6104 (diff)
parent65d1086c44791112188f6aebbdc3a27cab3736d3 (diff)
downloadlinux-628d4c46eef4fabe3ddbe07698577162c1cd5d41.tar.xz
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next
Resync with drm-next, I have a patch which currently can't be applied because drm-misc-next lacked the latest drm/i915 code. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation/gpu')
-rw-r--r--Documentation/gpu/i915.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index b0d6709b8600..9c7ed3e3f1e9 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -222,6 +222,15 @@ Video BIOS Table (VBT)
.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h
:internal:
+Display clocks
+--------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c
+ :doc: CDCLK / RAWCLK
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c
+ :internal:
+
Display PLLs
------------