|
@@ -57,26 +57,37 @@
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
- * drm_modeset_lock_all - take all modeset locks
|
|
|
|
- * @dev: drm device
|
|
|
|
|
|
+ * __drm_modeset_lock_all - internal helper to grab all modeset locks
|
|
|
|
+ * @dev: DRM device
|
|
|
|
+ * @trylock: trylock mode for atomic contexts
|
|
*
|
|
*
|
|
- * This function takes all modeset locks, suitable where a more fine-grained
|
|
|
|
- * scheme isn't (yet) implemented. Locks must be dropped with
|
|
|
|
- * drm_modeset_unlock_all.
|
|
|
|
|
|
+ * This is a special version of drm_modeset_lock_all() which can also be used in
|
|
|
|
+ * atomic contexts. Then @trylock must be set to true.
|
|
|
|
+ *
|
|
|
|
+ * Returns:
|
|
|
|
+ * 0 on success or negative error code on failure.
|
|
*/
|
|
*/
|
|
-void drm_modeset_lock_all(struct drm_device *dev)
|
|
|
|
|
|
+int __drm_modeset_lock_all(struct drm_device *dev,
|
|
|
|
+ bool trylock)
|
|
{
|
|
{
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
struct drm_modeset_acquire_ctx *ctx;
|
|
struct drm_modeset_acquire_ctx *ctx;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
|
|
|
|
- if (WARN_ON(!ctx))
|
|
|
|
- return;
|
|
|
|
|
|
+ ctx = kzalloc(sizeof(*ctx),
|
|
|
|
+ trylock ? GFP_ATOMIC : GFP_KERNEL);
|
|
|
|
+ if (!ctx)
|
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
- mutex_lock(&config->mutex);
|
|
|
|
|
|
+ if (trylock) {
|
|
|
|
+ if (!mutex_trylock(&config->mutex))
|
|
|
|
+ return -EBUSY;
|
|
|
|
+ } else {
|
|
|
|
+ mutex_lock(&config->mutex);
|
|
|
|
+ }
|
|
|
|
|
|
drm_modeset_acquire_init(ctx, 0);
|
|
drm_modeset_acquire_init(ctx, 0);
|
|
|
|
+ ctx->trylock_only = trylock;
|
|
|
|
|
|
retry:
|
|
retry:
|
|
ret = drm_modeset_lock(&config->connection_mutex, ctx);
|
|
ret = drm_modeset_lock(&config->connection_mutex, ctx);
|
|
@@ -95,13 +106,29 @@ retry:
|
|
|
|
|
|
drm_warn_on_modeset_not_all_locked(dev);
|
|
drm_warn_on_modeset_not_all_locked(dev);
|
|
|
|
|
|
- return;
|
|
|
|
|
|
+ return 0;
|
|
|
|
|
|
fail:
|
|
fail:
|
|
if (ret == -EDEADLK) {
|
|
if (ret == -EDEADLK) {
|
|
drm_modeset_backoff(ctx);
|
|
drm_modeset_backoff(ctx);
|
|
goto retry;
|
|
goto retry;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ return ret;
|
|
|
|
+}
|
|
|
|
+EXPORT_SYMBOL(__drm_modeset_lock_all);
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * drm_modeset_lock_all - take all modeset locks
|
|
|
|
+ * @dev: drm device
|
|
|
|
+ *
|
|
|
|
+ * This function takes all modeset locks, suitable where a more fine-grained
|
|
|
|
+ * scheme isn't (yet) implemented. Locks must be dropped with
|
|
|
|
+ * drm_modeset_unlock_all.
|
|
|
|
+ */
|
|
|
|
+void drm_modeset_lock_all(struct drm_device *dev)
|
|
|
|
+{
|
|
|
|
+ WARN_ON(__drm_modeset_lock_all(dev, false) != 0);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(drm_modeset_lock_all);
|
|
EXPORT_SYMBOL(drm_modeset_lock_all);
|
|
|
|
|
|
@@ -287,7 +314,12 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
|
|
|
|
|
|
WARN_ON(ctx->contended);
|
|
WARN_ON(ctx->contended);
|
|
|
|
|
|
- if (interruptible && slow) {
|
|
|
|
|
|
+ if (ctx->trylock_only) {
|
|
|
|
+ if (!ww_mutex_trylock(&lock->mutex))
|
|
|
|
+ return -EBUSY;
|
|
|
|
+ else
|
|
|
|
+ return 0;
|
|
|
|
+ } else if (interruptible && slow) {
|
|
ret = ww_mutex_lock_slow_interruptible(&lock->mutex, &ctx->ww_ctx);
|
|
ret = ww_mutex_lock_slow_interruptible(&lock->mutex, &ctx->ww_ctx);
|
|
} else if (interruptible) {
|
|
} else if (interruptible) {
|
|
ret = ww_mutex_lock_interruptible(&lock->mutex, &ctx->ww_ctx);
|
|
ret = ww_mutex_lock_interruptible(&lock->mutex, &ctx->ww_ctx);
|