drm/doc: Convert to markdown
DRM Docbook is now Markdown ready. This means its doc is able to use markdown text on it. * Documentation/DocBook/drm.tmpl: Contains a table duplicated from drivers/gpu/drm/i915/i915_reg.h. This is not needed anymore * drivers/gpu/drm/drm_modeset_lock.c: had a code example that used to look pretty bad on html. Fixed by using proper code markup. * drivers/gpu/drm/drm_prime.c: Remove spaces between lines to make a proper markup list. * drivers/gpu/drm/i915/i915_reg.h: Altought pandoc supports tables, it doesn't support table cell spanning. But we can use fixed-width for those special cases. * include/drm/drm_vma_manager.h: Another code example that should be proper indented with four spaces. v2 (Daniel): Adjust name to gpu.xml due to rename. v3 (Daniel): Split out the actual enabling in the Makefile - this way we can merge the conversion, while just keeping the enabling in a drm-private tree. Signed-off-by: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> (v1) Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Stephan Mueller <smueller@chronox.de> Cc: Michal Marek <mmarek@suse.cz> Cc: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: intel-gfx <intel-gfx@lists.freedesktop.org> Cc: dri-devel <dri-devel@lists.freedesktop.org> Acked-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448471279-19748-2-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
parent
51bce5bc38
commit
f03d8ede7a
|
@ -3570,92 +3570,6 @@ int num_ioctls;</synopsis>
|
|||
<sect2>
|
||||
<title>DPIO</title>
|
||||
!Pdrivers/gpu/drm/i915/i915_reg.h DPIO
|
||||
<table id="dpiox2">
|
||||
<title>Dual channel PHY (VLV/CHV/BXT)</title>
|
||||
<tgroup cols="8">
|
||||
<colspec colname="c0" />
|
||||
<colspec colname="c1" />
|
||||
<colspec colname="c2" />
|
||||
<colspec colname="c3" />
|
||||
<colspec colname="c4" />
|
||||
<colspec colname="c5" />
|
||||
<colspec colname="c6" />
|
||||
<colspec colname="c7" />
|
||||
<spanspec spanname="ch0" namest="c0" nameend="c3" />
|
||||
<spanspec spanname="ch1" namest="c4" nameend="c7" />
|
||||
<spanspec spanname="ch0pcs01" namest="c0" nameend="c1" />
|
||||
<spanspec spanname="ch0pcs23" namest="c2" nameend="c3" />
|
||||
<spanspec spanname="ch1pcs01" namest="c4" nameend="c5" />
|
||||
<spanspec spanname="ch1pcs23" namest="c6" nameend="c7" />
|
||||
<thead>
|
||||
<row>
|
||||
<entry spanname="ch0">CH0</entry>
|
||||
<entry spanname="ch1">CH1</entry>
|
||||
</row>
|
||||
</thead>
|
||||
<tbody valign="top" align="center">
|
||||
<row>
|
||||
<entry spanname="ch0">CMN/PLL/REF</entry>
|
||||
<entry spanname="ch1">CMN/PLL/REF</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry spanname="ch0pcs01">PCS01</entry>
|
||||
<entry spanname="ch0pcs23">PCS23</entry>
|
||||
<entry spanname="ch1pcs01">PCS01</entry>
|
||||
<entry spanname="ch1pcs23">PCS23</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>TX0</entry>
|
||||
<entry>TX1</entry>
|
||||
<entry>TX2</entry>
|
||||
<entry>TX3</entry>
|
||||
<entry>TX0</entry>
|
||||
<entry>TX1</entry>
|
||||
<entry>TX2</entry>
|
||||
<entry>TX3</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry spanname="ch0">DDI0</entry>
|
||||
<entry spanname="ch1">DDI1</entry>
|
||||
</row>
|
||||
</tbody>
|
||||
</tgroup>
|
||||
</table>
|
||||
<table id="dpiox1">
|
||||
<title>Single channel PHY (CHV/BXT)</title>
|
||||
<tgroup cols="4">
|
||||
<colspec colname="c0" />
|
||||
<colspec colname="c1" />
|
||||
<colspec colname="c2" />
|
||||
<colspec colname="c3" />
|
||||
<spanspec spanname="ch0" namest="c0" nameend="c3" />
|
||||
<spanspec spanname="ch0pcs01" namest="c0" nameend="c1" />
|
||||
<spanspec spanname="ch0pcs23" namest="c2" nameend="c3" />
|
||||
<thead>
|
||||
<row>
|
||||
<entry spanname="ch0">CH0</entry>
|
||||
</row>
|
||||
</thead>
|
||||
<tbody valign="top" align="center">
|
||||
<row>
|
||||
<entry spanname="ch0">CMN/PLL/REF</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry spanname="ch0pcs01">PCS01</entry>
|
||||
<entry spanname="ch0pcs23">PCS23</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>TX0</entry>
|
||||
<entry>TX1</entry>
|
||||
<entry>TX2</entry>
|
||||
<entry>TX3</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry spanname="ch0">DDI2</entry>
|
||||
</row>
|
||||
</tbody>
|
||||
</tgroup>
|
||||
</table>
|
||||
</sect2>
|
||||
|
||||
<sect2>
|
||||
|
|
|
@ -553,10 +553,10 @@ EXPORT_SYMBOL(drm_gtf_mode_complex);
|
|||
* drivers/video/fbmon.c
|
||||
*
|
||||
* Standard GTF parameters:
|
||||
* M = 600
|
||||
* C = 40
|
||||
* K = 128
|
||||
* J = 20
|
||||
* M = 600
|
||||
* C = 40
|
||||
* K = 128
|
||||
* J = 20
|
||||
*
|
||||
* Returns:
|
||||
* The modeline based on the GTF algorithm stored in a drm_display_mode object.
|
||||
|
@ -1244,7 +1244,7 @@ EXPORT_SYMBOL(drm_mode_connector_list_update);
|
|||
* This uses the same parameters as the fb modedb.c, except for an extra
|
||||
* force-enable, force-enable-digital and force-disable bit at the end:
|
||||
*
|
||||
* <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
|
||||
* <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
|
||||
*
|
||||
* The intermediate drm_cmdline_mode structure is required to store additional
|
||||
* options from the command line modline like the force-enable/disable flag.
|
||||
|
@ -1523,4 +1523,4 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
|
|||
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,17 +40,15 @@
|
|||
* The basic usage pattern is to:
|
||||
*
|
||||
* drm_modeset_acquire_init(&ctx)
|
||||
* retry:
|
||||
* retry:
|
||||
* foreach (lock in random_ordered_set_of_locks) {
|
||||
* ret = drm_modeset_lock(lock, &ctx)
|
||||
* if (ret == -EDEADLK) {
|
||||
* drm_modeset_backoff(&ctx);
|
||||
* goto retry;
|
||||
* }
|
||||
* ret = drm_modeset_lock(lock, &ctx)
|
||||
* if (ret == -EDEADLK) {
|
||||
* drm_modeset_backoff(&ctx);
|
||||
* goto retry;
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* ... do stuff ...
|
||||
*
|
||||
* drm_modeset_drop_locks(&ctx);
|
||||
* drm_modeset_acquire_fini(&ctx);
|
||||
*/
|
||||
|
|
|
@ -313,19 +313,15 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
|
|||
*
|
||||
* Export callbacks:
|
||||
*
|
||||
* - @gem_prime_pin (optional): prepare a GEM object for exporting
|
||||
*
|
||||
* - @gem_prime_get_sg_table: provide a scatter/gather table of pinned pages
|
||||
*
|
||||
* - @gem_prime_vmap: vmap a buffer exported by your driver
|
||||
*
|
||||
* - @gem_prime_vunmap: vunmap a buffer exported by your driver
|
||||
*
|
||||
* - @gem_prime_mmap (optional): mmap a buffer exported by your driver
|
||||
* * @gem_prime_pin (optional): prepare a GEM object for exporting
|
||||
* * @gem_prime_get_sg_table: provide a scatter/gather table of pinned pages
|
||||
* * @gem_prime_vmap: vmap a buffer exported by your driver
|
||||
* * @gem_prime_vunmap: vunmap a buffer exported by your driver
|
||||
* * @gem_prime_mmap (optional): mmap a buffer exported by your driver
|
||||
*
|
||||
* Import callback:
|
||||
*
|
||||
* - @gem_prime_import_sg_table (import): produce a GEM object from another
|
||||
* * @gem_prime_import_sg_table (import): produce a GEM object from another
|
||||
* driver's scatter/gather table
|
||||
*/
|
||||
|
||||
|
|
|
@ -855,31 +855,31 @@ enum skl_disp_power_wells {
|
|||
*
|
||||
* Note: DDI0 is digital port B, DD1 is digital port C, and DDI2 is
|
||||
* digital port D (CHV) or port A (BXT).
|
||||
*/
|
||||
/*
|
||||
* Dual channel PHY (VLV/CHV/BXT)
|
||||
* ---------------------------------
|
||||
* | CH0 | CH1 |
|
||||
* | CMN/PLL/REF | CMN/PLL/REF |
|
||||
* |---------------|---------------| Display PHY
|
||||
* | PCS01 | PCS23 | PCS01 | PCS23 |
|
||||
* |-------|-------|-------|-------|
|
||||
* |TX0|TX1|TX2|TX3|TX0|TX1|TX2|TX3|
|
||||
* ---------------------------------
|
||||
* | DDI0 | DDI1 | DP/HDMI ports
|
||||
* ---------------------------------
|
||||
*
|
||||
* Single channel PHY (CHV/BXT)
|
||||
* -----------------
|
||||
* | CH0 |
|
||||
* | CMN/PLL/REF |
|
||||
* |---------------| Display PHY
|
||||
* | PCS01 | PCS23 |
|
||||
* |-------|-------|
|
||||
* |TX0|TX1|TX2|TX3|
|
||||
* -----------------
|
||||
* | DDI2 | DP/HDMI port
|
||||
* -----------------
|
||||
*
|
||||
* Dual channel PHY (VLV/CHV/BXT)
|
||||
* ---------------------------------
|
||||
* | CH0 | CH1 |
|
||||
* | CMN/PLL/REF | CMN/PLL/REF |
|
||||
* |---------------|---------------| Display PHY
|
||||
* | PCS01 | PCS23 | PCS01 | PCS23 |
|
||||
* |-------|-------|-------|-------|
|
||||
* |TX0|TX1|TX2|TX3|TX0|TX1|TX2|TX3|
|
||||
* ---------------------------------
|
||||
* | DDI0 | DDI1 | DP/HDMI ports
|
||||
* ---------------------------------
|
||||
*
|
||||
* Single channel PHY (CHV/BXT)
|
||||
* -----------------
|
||||
* | CH0 |
|
||||
* | CMN/PLL/REF |
|
||||
* |---------------| Display PHY
|
||||
* | PCS01 | PCS23 |
|
||||
* |-------|-------|
|
||||
* |TX0|TX1|TX2|TX3|
|
||||
* -----------------
|
||||
* | DDI2 | DP/HDMI port
|
||||
* -----------------
|
||||
*/
|
||||
#define DPIO_DEVFN 0
|
||||
|
||||
|
|
Loading…
Reference in New Issue