diff options
author | Dave Airlie <airlied@redhat.com> | 2015-01-08 18:13:41 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-01-08 18:13:41 -0500 |
commit | e5202a2289d746a94703ad937157d398fb2607cf (patch) | |
tree | b0b8869adfa0e4c0dc05f7a11588e5e21a580755 /Documentation/DocBook | |
parent | b1940cd21c0f4abdce101253e860feff547291b0 (diff) | |
parent | 7552e7dd9527c41f891c87854418896eaf309c20 (diff) |
Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next
Misc drm patches with mostly polish patches from Thierry, with a bit of
generic mode validation from Ville and a few other oddball things.
* tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel: (25 commits)
drm: Include drm_crtc_helper.h in DocBook
drm: Make drm_crtc_helper.h standalone includible
drm: Move IRQ related fields to proper section
drm: Remove stale comment
drm: Do basic sanity checks for user modes
drm: Perform basic sanity checks on probed modes
drm: Reorganize probed mode validation
drm/doc: Remove duplicate "by"
drm/info: Remove unused code
drm/cache: Use wbinvd helpers
drm/plane-helper: Test for plane disable earlier
drm/doc: Document drm_add_modes_noedid() usage
drm: bit of spell-check / editorializing.
drm: Prefer sizeof(type) over sizeof type
drm: Remove useless else block
drm: Remove unneeded braces for single statement blocks
drm: Do not assign in if condition
drm: Prefer kmalloc_array() over kmalloc() with multiply
drm: Prefer kcalloc() over kzalloc() with multiply
drm: Miscellaneous checkpatch whitespace cleanups
...
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 4b592ffbafee..8a0b2a84f4bf 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -1377,7 +1377,7 @@ int max_width, max_height;</synopsis> | |||
1377 | <itemizedlist> | 1377 | <itemizedlist> |
1378 | <listitem> | 1378 | <listitem> |
1379 | DRM_PLANE_TYPE_PRIMARY represents a "main" plane for a CRTC. Primary | 1379 | DRM_PLANE_TYPE_PRIMARY represents a "main" plane for a CRTC. Primary |
1380 | planes are the planes operated upon by by CRTC modesetting and flipping | 1380 | planes are the planes operated upon by CRTC modesetting and flipping |
1381 | operations described in <xref linkend="drm-kms-crtcops"/>. | 1381 | operations described in <xref linkend="drm-kms-crtcops"/>. |
1382 | </listitem> | 1382 | </listitem> |
1383 | <listitem> | 1383 | <listitem> |
@@ -2362,6 +2362,7 @@ void intel_crt_init(struct drm_device *dev) | |||
2362 | </sect2> | 2362 | </sect2> |
2363 | <sect2> | 2363 | <sect2> |
2364 | <title>Modeset Helper Functions Reference</title> | 2364 | <title>Modeset Helper Functions Reference</title> |
2365 | !Iinclude/drm/drm_crtc_helper.h | ||
2365 | !Edrivers/gpu/drm/drm_crtc_helper.c | 2366 | !Edrivers/gpu/drm/drm_crtc_helper.c |
2366 | !Pdrivers/gpu/drm/drm_crtc_helper.c overview | 2367 | !Pdrivers/gpu/drm/drm_crtc_helper.c overview |
2367 | </sect2> | 2368 | </sect2> |