Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b20f3867 authored by Sascha Hauer's avatar Sascha Hauer Committed by Dave Airlie
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4f988d13

drivers/gpu/drm/drm_crtc.c

+15 −6
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ EXPORT_SYMBOL(drm_mode_remove); 
 * @name: user visible name of the connector

 *

 * LOCKING:

 * Caller must hold @dev's mode_config lock.

 * Takes mode config lock.

 *

 * Initialises a preallocated connector. Connectors should be

 * subclassed as part of driver connector objects.
@@ -497,7 +497,7 @@ EXPORT_SYMBOL(drm_connector_init); 
 * @connector: connector to cleanup

 *

 * LOCKING:

 * Caller must hold @dev's mode_config lock.

 * Takes mode config lock.

 *

 * Cleans up the connector but doesn't free the object.

 */
@@ -1314,7 +1314,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, 
 * @arg: arg from ioctl

 *

 * LOCKING:

 * Caller? (FIXME)

 * Takes mode config lock.

 *

 * Construct a CRTC configuration structure to return to the user.

 *
@@ -1374,7 +1374,7 @@ int drm_mode_getcrtc(struct drm_device *dev, 
 * @arg: arg from ioctl

 *

 * LOCKING:

 * Caller? (FIXME)

 * Takes mode config lock.

 *

 * Construct a connector configuration structure to return to the user.

 *
@@ -1556,6 +1556,9 @@ int drm_mode_getencoder(struct drm_device *dev, void *data, 
 * @data: ioctl data

 * @file_priv: DRM file info

 *

 * LOCKING:

 * Takes mode config lock.

 *

 * Return an plane count and set of IDs.

 */

int drm_mode_getplane_res(struct drm_device *dev, void *data,
@@ -1602,6 +1605,9 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, 
 * @data: ioctl data

 * @file_priv: DRM file info

 *

 * LOCKING:

 * Takes mode config lock.

 *

 * Return plane info, including formats supported, gamma size, any

 * current fb, etc.

 */
@@ -1667,6 +1673,9 @@ int drm_mode_getplane(struct drm_device *dev, void *data, 
 * @data: ioctl data*

 * @file_prive: DRM file info

 *

 * LOCKING:

 * Takes mode config lock.

 *

 * Set plane info, including placement, fb, scaling, and other factors.

 * Or pass a NULL fb to disable.

 */
@@ -1797,7 +1806,7 @@ int drm_mode_setplane(struct drm_device *dev, void *data, 
 * @arg: arg from ioctl

 *

 * LOCKING:

 * Caller? (FIXME)

 * Takes mode config lock.

 *

 * Build a new CRTC configuration based on user request.

 *
@@ -2278,7 +2287,7 @@ int drm_mode_rmfb(struct drm_device *dev, 
 * @arg: arg from ioctl

 *

 * LOCKING:

 * Caller? (FIXME)

 * Takes mode config lock.

 *

 * Lookup the FB given its ID and return info about it.

 *