diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
index ab51cb3dcbc5..7f90c1e65690 100644
--- a/Documentation/DocBook/gpu.tmpl
+++ b/Documentation/DocBook/gpu.tmpl
@@ -40,6 +40,16 @@
+
+ Lukas
+ Wunner
+ vga_switcheroo documentation
+
+
+ lukas@wunner.de
+
+
+
@@ -51,6 +61,10 @@
2012
Laurent Pinchart
+
+ 2015
+ Lukas Wunner
+
@@ -69,6 +83,13 @@
Added extensive documentation about driver internals.
+
+ 1.1
+ 2015-10-11
+ LW
+ Added vga_switcheroo documentation.
+
+
@@ -3583,10 +3604,11 @@ void (*postclose) (struct drm_device *, struct drm_file *);
plane properties to default value, so that a subsequent open of the
device will not inherit state from the previous user. It can also be
used to execute delayed power switching state changes, e.g. in
- conjunction with the vga_switcheroo infrastructure. Beyond that KMS
- drivers should not do any further cleanup. Only legacy UMS drivers might
- need to clean up device state so that the vga console or an independent
- fbdev driver could take over.
+ conjunction with the vga_switcheroo infrastructure (see
+ ). Beyond that KMS drivers should not
+ do any further cleanup. Only legacy UMS drivers might need to clean up
+ device state so that the vga console or an independent fbdev driver
+ could take over.
@@ -4200,4 +4222,50 @@ int num_ioctls;
!Cdrivers/gpu/drm/i915/i915_irq.c
+
+
+ vga_switcheroo
+
+!Pdrivers/gpu/vga/vga_switcheroo.c Overview
+
+
+
+ Modes of Use
+
+ Manual switching and manual power control
+!Pdrivers/gpu/vga/vga_switcheroo.c Manual switching and manual power control
+
+
+ Driver power control
+!Pdrivers/gpu/vga/vga_switcheroo.c Driver power control
+
+
+
+
+ Public functions
+!Edrivers/gpu/vga/vga_switcheroo.c
+
+
+
+ Public structures
+!Finclude/linux/vga_switcheroo.h vga_switcheroo_handler
+!Finclude/linux/vga_switcheroo.h vga_switcheroo_client_ops
+
+
+
+ Public constants
+!Finclude/linux/vga_switcheroo.h vga_switcheroo_client_id
+!Finclude/linux/vga_switcheroo.h vga_switcheroo_state
+
+
+
+ Private structures
+!Fdrivers/gpu/vga/vga_switcheroo.c vgasr_priv
+!Fdrivers/gpu/vga/vga_switcheroo.c vga_switcheroo_client
+
+
+!Cdrivers/gpu/vga/vga_switcheroo.c
+!Cinclude/linux/vga_switcheroo.h
+
+