lkml.org 
[lkml]   [2021]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 19/20] drm: cleanup: remove drm_modeset_(un)lock_all()
    Date
    Functions drm_modeset_lock_all() and drm_modeset_unlock_all() are no
    longer used anywhere and can be removed.

    Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
    ---
    drivers/gpu/drm/drm_modeset_lock.c | 94 +-----------------------------
    include/drm/drm_modeset_lock.h | 2 -
    2 files changed, 3 insertions(+), 93 deletions(-)

    diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
    index 4d32b61fa1fd..b2b84ca2b738 100644
    --- a/drivers/gpu/drm/drm_modeset_lock.c
    +++ b/drivers/gpu/drm/drm_modeset_lock.c
    @@ -117,93 +117,6 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
    }
    #endif /* CONFIG_DRM_DEBUG_MODESET_LOCK */

    -/**
    - * 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 by calling the
    - * drm_modeset_unlock_all() function.
    - *
    - * This function is deprecated. It allocates a lock acquisition context and
    - * stores it in &drm_device.mode_config. This facilitate conversion of
    - * existing code because it removes the need to manually deal with the
    - * acquisition context, but it is also brittle because the context is global
    - * and care must be taken not to nest calls. New code should use the
    - * drm_modeset_lock_all_ctx() function and pass in the context explicitly.
    - */
    -void drm_modeset_lock_all(struct drm_device *dev)
    -{
    - struct drm_mode_config *config = &dev->mode_config;
    - struct drm_modeset_acquire_ctx *ctx;
    - int ret;
    -
    - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL | __GFP_NOFAIL);
    - if (WARN_ON(!ctx))
    - return;
    -
    - mutex_lock(&config->mutex);
    -
    - drm_modeset_acquire_init(ctx, 0);
    -
    -retry:
    - ret = drm_modeset_lock_all_ctx(dev, ctx);
    - if (ret < 0) {
    - if (ret == -EDEADLK) {
    - drm_modeset_backoff(ctx);
    - goto retry;
    - }
    -
    - drm_modeset_acquire_fini(ctx);
    - kfree(ctx);
    - return;
    - }
    - ww_acquire_done(&ctx->ww_ctx);
    -
    - WARN_ON(config->acquire_ctx);
    -
    - /*
    - * We hold the locks now, so it is safe to stash the acquisition
    - * context for drm_modeset_unlock_all().
    - */
    - config->acquire_ctx = ctx;
    -
    - drm_warn_on_modeset_not_all_locked(dev);
    -}
    -EXPORT_SYMBOL(drm_modeset_lock_all);
    -
    -/**
    - * drm_modeset_unlock_all - drop all modeset locks
    - * @dev: DRM device
    - *
    - * This function drops all modeset locks taken by a previous call to the
    - * drm_modeset_lock_all() function.
    - *
    - * This function is deprecated. It uses the lock acquisition context stored
    - * in &drm_device.mode_config. This facilitates conversion of existing
    - * code because it removes the need to manually deal with the acquisition
    - * context, but it is also brittle because the context is global and care must
    - * be taken not to nest calls. New code should pass the acquisition context
    - * directly to the drm_modeset_drop_locks() function.
    - */
    -void drm_modeset_unlock_all(struct drm_device *dev)
    -{
    - struct drm_mode_config *config = &dev->mode_config;
    - struct drm_modeset_acquire_ctx *ctx = config->acquire_ctx;
    -
    - if (WARN_ON(!ctx))
    - return;
    -
    - config->acquire_ctx = NULL;
    - drm_modeset_drop_locks(ctx);
    - drm_modeset_acquire_fini(ctx);
    -
    - kfree(ctx);
    -
    - mutex_unlock(&dev->mode_config.mutex);
    -}
    -EXPORT_SYMBOL(drm_modeset_unlock_all);
    -
    /**
    * drm_warn_on_modeset_not_all_locked - check that all modeset locks are locked
    * @dev: device
    @@ -425,10 +338,9 @@ EXPORT_SYMBOL(drm_modeset_unlock);
    * This function takes all modeset locks, suitable where a more fine-grained
    * scheme isn't (yet) implemented.
    *
    - * Unlike drm_modeset_lock_all(), it doesn't take the &drm_mode_config.mutex
    - * since that lock isn't required for modeset state changes. Callers which
    - * need to grab that lock too need to do so outside of the acquire context
    - * @ctx.
    + * It doesn't take the &drm_mode_config.mutex since that lock isn't required for
    + * modeset state changes. Callers which need to grab that lock too need to do so
    + * outside of the acquire context @ctx.
    *
    * Locks acquired with this function should be released by calling the
    * drm_modeset_drop_locks() function on @ctx.
    diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h
    index b84693fbd2b5..96b853530120 100644
    --- a/include/drm/drm_modeset_lock.h
    +++ b/include/drm/drm_modeset_lock.h
    @@ -140,8 +140,6 @@ struct drm_device;
    struct drm_crtc;
    struct drm_plane;

    -void drm_modeset_lock_all(struct drm_device *dev);
    -void drm_modeset_unlock_all(struct drm_device *dev);
    void drm_warn_on_modeset_not_all_locked(struct drm_device *dev);

    int drm_modeset_lock_all_ctx(struct drm_device *dev,
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-10-13 22:51    [W:4.117 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site