diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-01 18:09:18 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-20 09:29:18 -0500 |
commit | 065a50ed3ef75cb265e12e3e1b615db0835150bc (patch) | |
tree | 2a8971095d7075a659285b84978c982a3153fa6d | |
parent | 8faf6b18a2a6bece008de1e6bb80f0c608e58483 (diff) |
drm/doc: integrate drm_crtc.c kerneldoc
And do a quick pass to adjust them to the last few (years?) of changes
...
This time actually compile-tested ;-)
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 92 |
2 files changed, 48 insertions, 48 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 4ee2304f82f9..caab791b0a6c 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -1609,6 +1609,10 @@ void intel_crt_init(struct drm_device *dev) | |||
1609 | make its properties available to applications. | 1609 | make its properties available to applications. |
1610 | </para> | 1610 | </para> |
1611 | </sect2> | 1611 | </sect2> |
1612 | <sect2> | ||
1613 | <title>KMS API Functions</title> | ||
1614 | !Edrivers/gpu/drm/drm_crtc.c | ||
1615 | </sect2> | ||
1612 | </sect1> | 1616 | </sect1> |
1613 | 1617 | ||
1614 | <!-- Internals: kms helper functions --> | 1618 | <!-- Internals: kms helper functions --> |
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index b970e4147862..81545540b2df 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -203,10 +203,10 @@ char *drm_get_connector_status_name(enum drm_connector_status status) | |||
203 | } | 203 | } |
204 | 204 | ||
205 | /** | 205 | /** |
206 | * drm_mode_object_get - allocate a new identifier | 206 | * drm_mode_object_get - allocate a new modeset identifier |
207 | * @dev: DRM device | 207 | * @dev: DRM device |
208 | * @ptr: object pointer, used to generate unique ID | 208 | * @obj: object pointer, used to generate unique ID |
209 | * @type: object type | 209 | * @obj_type: object type |
210 | * | 210 | * |
211 | * Create a unique identifier based on @ptr in @dev's identifier space. Used | 211 | * Create a unique identifier based on @ptr in @dev's identifier space. Used |
212 | * for tracking modes, CRTCs and connectors. | 212 | * for tracking modes, CRTCs and connectors. |
@@ -241,9 +241,9 @@ again: | |||
241 | } | 241 | } |
242 | 242 | ||
243 | /** | 243 | /** |
244 | * drm_mode_object_put - free an identifer | 244 | * drm_mode_object_put - free a modeset identifer |
245 | * @dev: DRM device | 245 | * @dev: DRM device |
246 | * @id: ID to free | 246 | * @object: object to free |
247 | * | 247 | * |
248 | * Free @id from @dev's unique identifier pool. | 248 | * Free @id from @dev's unique identifier pool. |
249 | */ | 249 | */ |
@@ -273,6 +273,8 @@ EXPORT_SYMBOL(drm_mode_object_find); | |||
273 | /** | 273 | /** |
274 | * drm_framebuffer_init - initialize a framebuffer | 274 | * drm_framebuffer_init - initialize a framebuffer |
275 | * @dev: DRM device | 275 | * @dev: DRM device |
276 | * @fb: framebuffer to be initialized | ||
277 | * @funcs: ... with these functions | ||
276 | * | 278 | * |
277 | * Allocates an ID for the framebuffer's parent mode object, sets its mode | 279 | * Allocates an ID for the framebuffer's parent mode object, sets its mode |
278 | * functions & device file and adds it to the master fd list. | 280 | * functions & device file and adds it to the master fd list. |
@@ -309,6 +311,9 @@ static void drm_framebuffer_free(struct kref *kref) | |||
309 | 311 | ||
310 | /** | 312 | /** |
311 | * drm_framebuffer_unreference - unref a framebuffer | 313 | * drm_framebuffer_unreference - unref a framebuffer |
314 | * @fb: framebuffer to unref | ||
315 | * | ||
316 | * This functions decrements the fb's refcount and frees it if it drops to zero. | ||
312 | */ | 317 | */ |
313 | void drm_framebuffer_unreference(struct drm_framebuffer *fb) | 318 | void drm_framebuffer_unreference(struct drm_framebuffer *fb) |
314 | { | 319 | { |
@@ -321,6 +326,7 @@ EXPORT_SYMBOL(drm_framebuffer_unreference); | |||
321 | 326 | ||
322 | /** | 327 | /** |
323 | * drm_framebuffer_reference - incr the fb refcnt | 328 | * drm_framebuffer_reference - incr the fb refcnt |
329 | * @fb: framebuffer | ||
324 | */ | 330 | */ |
325 | void drm_framebuffer_reference(struct drm_framebuffer *fb) | 331 | void drm_framebuffer_reference(struct drm_framebuffer *fb) |
326 | { | 332 | { |
@@ -493,7 +499,7 @@ EXPORT_SYMBOL(drm_mode_remove); | |||
493 | * @dev: DRM device | 499 | * @dev: DRM device |
494 | * @connector: the connector to init | 500 | * @connector: the connector to init |
495 | * @funcs: callbacks for this connector | 501 | * @funcs: callbacks for this connector |
496 | * @name: user visible name of the connector | 502 | * @connector_type: user visible type of the connector |
497 | * | 503 | * |
498 | * Initialises a preallocated connector. Connectors should be | 504 | * Initialises a preallocated connector. Connectors should be |
499 | * subclassed as part of driver connector objects. | 505 | * subclassed as part of driver connector objects. |
@@ -1145,10 +1151,9 @@ static int drm_crtc_convert_umode(struct drm_display_mode *out, | |||
1145 | 1151 | ||
1146 | /** | 1152 | /** |
1147 | * drm_mode_getresources - get graphics configuration | 1153 | * drm_mode_getresources - get graphics configuration |
1148 | * @inode: inode from the ioctl | 1154 | * @dev: drm device for the ioctl |
1149 | * @filp: file * from the ioctl | 1155 | * @data: data pointer for the ioctl |
1150 | * @cmd: cmd from ioctl | 1156 | * @file_priv: drm file for the ioctl call |
1151 | * @arg: arg from ioctl | ||
1152 | * | 1157 | * |
1153 | * Construct a set of configuration description structures and return | 1158 | * Construct a set of configuration description structures and return |
1154 | * them to the user, including CRTC, connector and framebuffer configuration. | 1159 | * them to the user, including CRTC, connector and framebuffer configuration. |
@@ -1330,10 +1335,9 @@ out: | |||
1330 | 1335 | ||
1331 | /** | 1336 | /** |
1332 | * drm_mode_getcrtc - get CRTC configuration | 1337 | * drm_mode_getcrtc - get CRTC configuration |
1333 | * @inode: inode from the ioctl | 1338 | * @dev: drm device for the ioctl |
1334 | * @filp: file * from the ioctl | 1339 | * @data: data pointer for the ioctl |
1335 | * @cmd: cmd from ioctl | 1340 | * @file_priv: drm file for the ioctl call |
1336 | * @arg: arg from ioctl | ||
1337 | * | 1341 | * |
1338 | * Construct a CRTC configuration structure to return to the user. | 1342 | * Construct a CRTC configuration structure to return to the user. |
1339 | * | 1343 | * |
@@ -1387,10 +1391,9 @@ out: | |||
1387 | 1391 | ||
1388 | /** | 1392 | /** |
1389 | * drm_mode_getconnector - get connector configuration | 1393 | * drm_mode_getconnector - get connector configuration |
1390 | * @inode: inode from the ioctl | 1394 | * @dev: drm device for the ioctl |
1391 | * @filp: file * from the ioctl | 1395 | * @data: data pointer for the ioctl |
1392 | * @cmd: cmd from ioctl | 1396 | * @file_priv: drm file for the ioctl call |
1393 | * @arg: arg from ioctl | ||
1394 | * | 1397 | * |
1395 | * Construct a connector configuration structure to return to the user. | 1398 | * Construct a connector configuration structure to return to the user. |
1396 | * | 1399 | * |
@@ -1675,7 +1678,7 @@ out: | |||
1675 | * drm_mode_setplane - set up or tear down an plane | 1678 | * drm_mode_setplane - set up or tear down an plane |
1676 | * @dev: DRM device | 1679 | * @dev: DRM device |
1677 | * @data: ioctl data* | 1680 | * @data: ioctl data* |
1678 | * @file_prive: DRM file info | 1681 | * @file_priv: DRM file info |
1679 | * | 1682 | * |
1680 | * Set plane info, including placement, fb, scaling, and other factors. | 1683 | * Set plane info, including placement, fb, scaling, and other factors. |
1681 | * Or pass a NULL fb to disable. | 1684 | * Or pass a NULL fb to disable. |
@@ -1801,10 +1804,9 @@ out: | |||
1801 | 1804 | ||
1802 | /** | 1805 | /** |
1803 | * drm_mode_setcrtc - set CRTC configuration | 1806 | * drm_mode_setcrtc - set CRTC configuration |
1804 | * @inode: inode from the ioctl | 1807 | * @dev: drm device for the ioctl |
1805 | * @filp: file * from the ioctl | 1808 | * @data: data pointer for the ioctl |
1806 | * @cmd: cmd from ioctl | 1809 | * @file_priv: drm file for the ioctl call |
1807 | * @arg: arg from ioctl | ||
1808 | * | 1810 | * |
1809 | * Build a new CRTC configuration based on user request. | 1811 | * Build a new CRTC configuration based on user request. |
1810 | * | 1812 | * |
@@ -2056,10 +2058,9 @@ EXPORT_SYMBOL(drm_mode_legacy_fb_format); | |||
2056 | 2058 | ||
2057 | /** | 2059 | /** |
2058 | * drm_mode_addfb - add an FB to the graphics configuration | 2060 | * drm_mode_addfb - add an FB to the graphics configuration |
2059 | * @inode: inode from the ioctl | 2061 | * @dev: drm device for the ioctl |
2060 | * @filp: file * from the ioctl | 2062 | * @data: data pointer for the ioctl |
2061 | * @cmd: cmd from ioctl | 2063 | * @file_priv: drm file for the ioctl call |
2062 | * @arg: arg from ioctl | ||
2063 | * | 2064 | * |
2064 | * Add a new FB to the specified CRTC, given a user request. | 2065 | * Add a new FB to the specified CRTC, given a user request. |
2065 | * | 2066 | * |
@@ -2237,10 +2238,9 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) | |||
2237 | 2238 | ||
2238 | /** | 2239 | /** |
2239 | * drm_mode_addfb2 - add an FB to the graphics configuration | 2240 | * drm_mode_addfb2 - add an FB to the graphics configuration |
2240 | * @inode: inode from the ioctl | 2241 | * @dev: drm device for the ioctl |
2241 | * @filp: file * from the ioctl | 2242 | * @data: data pointer for the ioctl |
2242 | * @cmd: cmd from ioctl | 2243 | * @file_priv: drm file for the ioctl call |
2243 | * @arg: arg from ioctl | ||
2244 | * | 2244 | * |
2245 | * Add a new FB to the specified CRTC, given a user request with format. | 2245 | * Add a new FB to the specified CRTC, given a user request with format. |
2246 | * | 2246 | * |
@@ -2300,10 +2300,9 @@ out: | |||
2300 | 2300 | ||
2301 | /** | 2301 | /** |
2302 | * drm_mode_rmfb - remove an FB from the configuration | 2302 | * drm_mode_rmfb - remove an FB from the configuration |
2303 | * @inode: inode from the ioctl | 2303 | * @dev: drm device for the ioctl |
2304 | * @filp: file * from the ioctl | 2304 | * @data: data pointer for the ioctl |
2305 | * @cmd: cmd from ioctl | 2305 | * @file_priv: drm file for the ioctl call |
2306 | * @arg: arg from ioctl | ||
2307 | * | 2306 | * |
2308 | * Remove the FB specified by the user. | 2307 | * Remove the FB specified by the user. |
2309 | * | 2308 | * |
@@ -2352,10 +2351,9 @@ out: | |||
2352 | 2351 | ||
2353 | /** | 2352 | /** |
2354 | * drm_mode_getfb - get FB info | 2353 | * drm_mode_getfb - get FB info |
2355 | * @inode: inode from the ioctl | 2354 | * @dev: drm device for the ioctl |
2356 | * @filp: file * from the ioctl | 2355 | * @data: data pointer for the ioctl |
2357 | * @cmd: cmd from ioctl | 2356 | * @file_priv: drm file for the ioctl call |
2358 | * @arg: arg from ioctl | ||
2359 | * | 2357 | * |
2360 | * Lookup the FB given its ID and return info about it. | 2358 | * Lookup the FB given its ID and return info about it. |
2361 | * | 2359 | * |
@@ -2471,7 +2469,7 @@ out_err1: | |||
2471 | 2469 | ||
2472 | /** | 2470 | /** |
2473 | * drm_fb_release - remove and free the FBs on this file | 2471 | * drm_fb_release - remove and free the FBs on this file |
2474 | * @filp: file * from the ioctl | 2472 | * @priv: drm file for the ioctl |
2475 | * | 2473 | * |
2476 | * Destroy all the FBs associated with @filp. | 2474 | * Destroy all the FBs associated with @filp. |
2477 | * | 2475 | * |
@@ -2581,10 +2579,9 @@ EXPORT_SYMBOL(drm_mode_detachmode_crtc); | |||
2581 | 2579 | ||
2582 | /** | 2580 | /** |
2583 | * drm_fb_attachmode - Attach a user mode to an connector | 2581 | * drm_fb_attachmode - Attach a user mode to an connector |
2584 | * @inode: inode from the ioctl | 2582 | * @dev: drm device for the ioctl |
2585 | * @filp: file * from the ioctl | 2583 | * @data: data pointer for the ioctl |
2586 | * @cmd: cmd from ioctl | 2584 | * @file_priv: drm file for the ioctl call |
2587 | * @arg: arg from ioctl | ||
2588 | * | 2585 | * |
2589 | * This attaches a user specified mode to an connector. | 2586 | * This attaches a user specified mode to an connector. |
2590 | * Called by the user via ioctl. | 2587 | * Called by the user via ioctl. |
@@ -2636,10 +2633,9 @@ out: | |||
2636 | 2633 | ||
2637 | /** | 2634 | /** |
2638 | * drm_fb_detachmode - Detach a user specified mode from an connector | 2635 | * drm_fb_detachmode - Detach a user specified mode from an connector |
2639 | * @inode: inode from the ioctl | 2636 | * @dev: drm device for the ioctl |
2640 | * @filp: file * from the ioctl | 2637 | * @data: data pointer for the ioctl |
2641 | * @cmd: cmd from ioctl | 2638 | * @file_priv: drm file for the ioctl call |
2642 | * @arg: arg from ioctl | ||
2643 | * | 2639 | * |
2644 | * Called by the user via ioctl. | 2640 | * Called by the user via ioctl. |
2645 | * | 2641 | * |