aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-02-01 05:38:31 -0500
committerDave Airlie <airlied@redhat.com>2012-02-03 05:04:26 -0500
commitb20f38679fee704d5ebfe2815fb5af492a0dde9f (patch)
tree3eb7f51fd9269c2538e6ae309d12082026c5ac0a /drivers/gpu
parent4f988d132d2668b4f3b42bfc70daa531115ccca1 (diff)
drm crtc: Fix locking comments
Several comments above functions say that the caller must hold the mode_config lock, but the functions take the lock themselves. Fix the comments. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_crtc.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index df6e41356809..322bc7b13004 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -454,7 +454,7 @@ EXPORT_SYMBOL(drm_mode_remove);
454 * @name: user visible name of the connector 454 * @name: user visible name of the connector
455 * 455 *
456 * LOCKING: 456 * LOCKING:
457 * Caller must hold @dev's mode_config lock. 457 * Takes mode config lock.
458 * 458 *
459 * Initialises a preallocated connector. Connectors should be 459 * Initialises a preallocated connector. Connectors should be
460 * subclassed as part of driver connector objects. 460 * subclassed as part of driver connector objects.
@@ -497,7 +497,7 @@ EXPORT_SYMBOL(drm_connector_init);
497 * @connector: connector to cleanup 497 * @connector: connector to cleanup
498 * 498 *
499 * LOCKING: 499 * LOCKING:
500 * Caller must hold @dev's mode_config lock. 500 * Takes mode config lock.
501 * 501 *
502 * Cleans up the connector but doesn't free the object. 502 * Cleans up the connector but doesn't free the object.
503 */ 503 */
@@ -1314,7 +1314,7 @@ out:
1314 * @arg: arg from ioctl 1314 * @arg: arg from ioctl
1315 * 1315 *
1316 * LOCKING: 1316 * LOCKING:
1317 * Caller? (FIXME) 1317 * Takes mode config lock.
1318 * 1318 *
1319 * Construct a CRTC configuration structure to return to the user. 1319 * Construct a CRTC configuration structure to return to the user.
1320 * 1320 *
@@ -1374,7 +1374,7 @@ out:
1374 * @arg: arg from ioctl 1374 * @arg: arg from ioctl
1375 * 1375 *
1376 * LOCKING: 1376 * LOCKING:
1377 * Caller? (FIXME) 1377 * Takes mode config lock.
1378 * 1378 *
1379 * Construct a connector configuration structure to return to the user. 1379 * Construct a connector configuration structure to return to the user.
1380 * 1380 *
@@ -1556,6 +1556,9 @@ out:
1556 * @data: ioctl data 1556 * @data: ioctl data
1557 * @file_priv: DRM file info 1557 * @file_priv: DRM file info
1558 * 1558 *
1559 * LOCKING:
1560 * Takes mode config lock.
1561 *
1559 * Return an plane count and set of IDs. 1562 * Return an plane count and set of IDs.
1560 */ 1563 */
1561int drm_mode_getplane_res(struct drm_device *dev, void *data, 1564int drm_mode_getplane_res(struct drm_device *dev, void *data,
@@ -1602,6 +1605,9 @@ out:
1602 * @data: ioctl data 1605 * @data: ioctl data
1603 * @file_priv: DRM file info 1606 * @file_priv: DRM file info
1604 * 1607 *
1608 * LOCKING:
1609 * Takes mode config lock.
1610 *
1605 * Return plane info, including formats supported, gamma size, any 1611 * Return plane info, including formats supported, gamma size, any
1606 * current fb, etc. 1612 * current fb, etc.
1607 */ 1613 */
@@ -1667,6 +1673,9 @@ out:
1667 * @data: ioctl data* 1673 * @data: ioctl data*
1668 * @file_prive: DRM file info 1674 * @file_prive: DRM file info
1669 * 1675 *
1676 * LOCKING:
1677 * Takes mode config lock.
1678 *
1670 * Set plane info, including placement, fb, scaling, and other factors. 1679 * Set plane info, including placement, fb, scaling, and other factors.
1671 * Or pass a NULL fb to disable. 1680 * Or pass a NULL fb to disable.
1672 */ 1681 */
@@ -1797,7 +1806,7 @@ out:
1797 * @arg: arg from ioctl 1806 * @arg: arg from ioctl
1798 * 1807 *
1799 * LOCKING: 1808 * LOCKING:
1800 * Caller? (FIXME) 1809 * Takes mode config lock.
1801 * 1810 *
1802 * Build a new CRTC configuration based on user request. 1811 * Build a new CRTC configuration based on user request.
1803 * 1812 *
@@ -2278,7 +2287,7 @@ out:
2278 * @arg: arg from ioctl 2287 * @arg: arg from ioctl
2279 * 2288 *
2280 * LOCKING: 2289 * LOCKING:
2281 * Caller? (FIXME) 2290 * Takes mode config lock.
2282 * 2291 *
2283 * Lookup the FB given its ID and return info about it. 2292 * Lookup the FB given its ID and return info about it.
2284 * 2293 *