aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-05-31 16:55:13 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-06-03 14:58:24 -0400
commitda5335b8bd4aabc2362e2b3d5af7df49d7ec89e6 (patch)
treec38e750bd614381ddbad60d252ab1b7d1c9ed35f
parent00edbe196d737ebad419c2153dbaef8ef0a99f03 (diff)
drm/doc: Switch to sphinx/rst fixed-width quoting
Just fallout from switching from asciidoc to sphinx/rst. v2: Found more. Also s/\//#/ in the vgpu ascii-art - sphinx treats those as comments and switch to variable-width, which wreaks the layout. v3: Undo some of the hacks, rebasing onto latest version of Jani's series fixed it. Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r--drivers/gpu/drm/drm_bridge.c2
-rw-r--r--drivers/gpu/drm/drm_fb_cma_helper.c2
-rw-r--r--drivers/gpu/drm/drm_fops.c2
-rw-r--r--drivers/gpu/drm/drm_modes.c3
-rw-r--r--drivers/gpu/drm/drm_modeset_lock.c2
-rw-r--r--drivers/gpu/drm/drm_vma_manager.c3
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h2
-rw-r--r--drivers/gpu/drm/i915/i915_vgpu.c24
-rw-r--r--include/drm/drm_modes.h2
9 files changed, 24 insertions, 18 deletions
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index b3654404abd0..255543086590 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -36,7 +36,7 @@
36 * encoder chain. 36 * encoder chain.
37 * 37 *
38 * A bridge is always attached to a single &drm_encoder at a time, but can be 38 * A bridge is always attached to a single &drm_encoder at a time, but can be
39 * either connected to it directly, or through an intermediate bridge: 39 * either connected to it directly, or through an intermediate bridge::
40 * 40 *
41 * encoder ---> bridge B ---> bridge A 41 * encoder ---> bridge B ---> bridge A
42 * 42 *
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index c5673dee1bc8..e6195debb0d4 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -52,7 +52,7 @@ struct drm_fbdev_cma {
52 * will be set up automatically. dirty() is called by 52 * will be set up automatically. dirty() is called by
53 * drm_fb_helper_deferred_io() in process context (struct delayed_work). 53 * drm_fb_helper_deferred_io() in process context (struct delayed_work).
54 * 54 *
55 * Example fbdev deferred io code: 55 * Example fbdev deferred io code::
56 * 56 *
57 * static int driver_fbdev_fb_dirty(struct drm_framebuffer *fb, 57 * static int driver_fbdev_fb_dirty(struct drm_framebuffer *fb,
58 * struct drm_file *file_priv, 58 * struct drm_file *file_priv,
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index efa980a54c75..64121f567234 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -67,7 +67,7 @@ DEFINE_MUTEX(drm_global_mutex);
67 * specific implementations. For GEM-based drivers this is drm_gem_mmap(). 67 * specific implementations. For GEM-based drivers this is drm_gem_mmap().
68 * 68 *
69 * No other file operations are supported by the DRM userspace API. Overall the 69 * No other file operations are supported by the DRM userspace API. Overall the
70 * following is an example #file_operations structure: 70 * following is an example #file_operations structure::
71 * 71 *
72 * static const example_drm_fops = { 72 * static const example_drm_fops = {
73 * .owner = THIS_MODULE, 73 * .owner = THIS_MODULE,
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index adf73f8516af..f8f70c85b648 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -553,7 +553,8 @@ EXPORT_SYMBOL(drm_gtf_mode_complex);
553 * I also refer to the function of fb_get_mode in the file of 553 * I also refer to the function of fb_get_mode in the file of
554 * drivers/video/fbmon.c 554 * drivers/video/fbmon.c
555 * 555 *
556 * Standard GTF parameters: 556 * Standard GTF parameters::
557 *
557 * M = 600 558 * M = 600
558 * C = 40 559 * C = 40
559 * K = 128 560 * K = 128
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index f33ebe638a28..61146f5b4f56 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -37,7 +37,7 @@
37 * 37 *
38 * For basic principles of &ww_mutex, see: Documentation/locking/ww-mutex-design.txt 38 * For basic principles of &ww_mutex, see: Documentation/locking/ww-mutex-design.txt
39 * 39 *
40 * The basic usage pattern is to: 40 * The basic usage pattern is to::
41 * 41 *
42 * drm_modeset_acquire_init(&ctx) 42 * drm_modeset_acquire_init(&ctx)
43 * retry: 43 * retry:
diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c
index 2f2ecde8285b..f306c8855978 100644
--- a/drivers/gpu/drm/drm_vma_manager.c
+++ b/drivers/gpu/drm/drm_vma_manager.c
@@ -127,6 +127,9 @@ EXPORT_SYMBOL(drm_vma_offset_manager_destroy);
127 * used to implement weakly referenced lookups using kref_get_unless_zero(). 127 * used to implement weakly referenced lookups using kref_get_unless_zero().
128 * 128 *
129 * Example: 129 * Example:
130 *
131 * ::
132 *
130 * drm_vma_offset_lock_lookup(mgr); 133 * drm_vma_offset_lock_lookup(mgr);
131 * node = drm_vma_offset_lookup_locked(mgr); 134 * node = drm_vma_offset_lookup_locked(mgr);
132 * if (node) 135 * if (node)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e3077259541a..482c10913ad6 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -886,7 +886,7 @@ enum skl_disp_power_wells {
886 * PLLs can be routed to any transcoder A/B/C. 886 * PLLs can be routed to any transcoder A/B/C.
887 * 887 *
888 * Note: DDI0 is digital port B, DD1 is digital port C, and DDI2 is 888 * Note: DDI0 is digital port B, DD1 is digital port C, and DDI2 is
889 * digital port D (CHV) or port A (BXT). 889 * digital port D (CHV) or port A (BXT). ::
890 * 890 *
891 * 891 *
892 * Dual channel PHY (VLV/CHV/BXT) 892 * Dual channel PHY (VLV/CHV/BXT)
diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915_vgpu.c
index d5a7a5e7ee7e..004326291854 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.c
+++ b/drivers/gpu/drm/i915/i915_vgpu.c
@@ -150,28 +150,28 @@ static int vgt_balloon_space(struct drm_mm *mm,
150 * of its graphic space being zero. Yet there are some portions ballooned out( 150 * of its graphic space being zero. Yet there are some portions ballooned out(
151 * the shadow part, which are marked as reserved by drm allocator). From the 151 * the shadow part, which are marked as reserved by drm allocator). From the
152 * host point of view, the graphic address space is partitioned by multiple 152 * host point of view, the graphic address space is partitioned by multiple
153 * vGPUs in different VMs. 153 * vGPUs in different VMs. ::
154 * 154 *
155 * vGPU1 view Host view 155 * vGPU1 view Host view
156 * 0 ------> +-----------+ +-----------+ 156 * 0 ------> +-----------+ +-----------+
157 * ^ |///////////| | vGPU3 | 157 * ^ |###########| | vGPU3 |
158 * | |///////////| +-----------+ 158 * | |###########| +-----------+
159 * | |///////////| | vGPU2 | 159 * | |###########| | vGPU2 |
160 * | +-----------+ +-----------+ 160 * | +-----------+ +-----------+
161 * mappable GM | available | ==> | vGPU1 | 161 * mappable GM | available | ==> | vGPU1 |
162 * | +-----------+ +-----------+ 162 * | +-----------+ +-----------+
163 * | |///////////| | | 163 * | |###########| | |
164 * v |///////////| | Host | 164 * v |###########| | Host |
165 * +=======+===========+ +===========+ 165 * +=======+===========+ +===========+
166 * ^ |///////////| | vGPU3 | 166 * ^ |###########| | vGPU3 |
167 * | |///////////| +-----------+ 167 * | |###########| +-----------+
168 * | |///////////| | vGPU2 | 168 * | |###########| | vGPU2 |
169 * | +-----------+ +-----------+ 169 * | +-----------+ +-----------+
170 * unmappable GM | available | ==> | vGPU1 | 170 * unmappable GM | available | ==> | vGPU1 |
171 * | +-----------+ +-----------+ 171 * | +-----------+ +-----------+
172 * | |///////////| | | 172 * | |###########| | |
173 * | |///////////| | Host | 173 * | |###########| | Host |
174 * v |///////////| | | 174 * v |###########| | |
175 * total GM size ------> +-----------+ +-----------+ 175 * total GM size ------> +-----------+ +-----------+
176 * 176 *
177 * Returns: 177 * Returns:
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 625966a906f2..ff481770d76b 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -169,6 +169,8 @@ enum drm_mode_status {
169 * 169 *
170 * The horizontal and vertical timings are defined per the following diagram. 170 * The horizontal and vertical timings are defined per the following diagram.
171 * 171 *
172 * ::
173 *
172 * 174 *
173 * Active Front Sync Back 175 * Active Front Sync Back
174 * Region Porch Porch 176 * Region Porch Porch