diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-11-11 08:14:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-11-11 08:14:19 +1000 |
| commit | f8ca7b74192b2e64bdfb89fb63c1d33b92bc899d (patch) | |
| tree | 1fcf742adb2cefef5b018d5a4753c1e6f6d611da /drivers/gpu/drm/drm_modeset_lock.c | |
| parent | 917a6f0bdbc55c2e9770ab523768578db8e8ddb3 (diff) | |
| parent | bcae3af286f49bf4f6cda03f165fbe530f4a6bed (diff) | |
Merge tag 'drm-misc-next-fixes-2021-11-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Removed the TTM Huge Page functionnality to address a crash, a timeout
fix for udl, CONFIG_FB dependency improvements, a fix for a circular
locking depency in imx, a NULL pointer dereference fix for virtio, and a
naming collision fix for drm/locking.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211110082114.vfpkpnecwdfg27lk@gilmour
Diffstat (limited to 'drivers/gpu/drm/drm_modeset_lock.c')
| -rw-r--r-- | drivers/gpu/drm/drm_modeset_lock.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c index 4d32b61fa1fd..c97323365675 100644 --- a/drivers/gpu/drm/drm_modeset_lock.c +++ b/drivers/gpu/drm/drm_modeset_lock.c @@ -79,7 +79,7 @@ static DEFINE_WW_CLASS(crtc_ww_class); #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) -static noinline depot_stack_handle_t __stack_depot_save(void) +static noinline depot_stack_handle_t __drm_stack_depot_save(void) { unsigned long entries[8]; unsigned int n; @@ -89,7 +89,7 @@ static noinline depot_stack_handle_t __stack_depot_save(void) return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN); } -static void __stack_depot_print(depot_stack_handle_t stack_depot) +static void __drm_stack_depot_print(depot_stack_handle_t stack_depot) { struct drm_printer p = drm_debug_printer("drm_modeset_lock"); unsigned long *entries; @@ -108,11 +108,11 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot) kfree(buf); } #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ -static depot_stack_handle_t __stack_depot_save(void) +static depot_stack_handle_t __drm_stack_depot_save(void) { return 0; } -static void __stack_depot_print(depot_stack_handle_t stack_depot) +static void __drm_stack_depot_print(depot_stack_handle_t stack_depot) { } #endif /* CONFIG_DRM_DEBUG_MODESET_LOCK */ @@ -266,7 +266,7 @@ EXPORT_SYMBOL(drm_modeset_acquire_fini); void drm_modeset_drop_locks(struct drm_modeset_acquire_ctx *ctx) { if (WARN_ON(ctx->contended)) - __stack_depot_print(ctx->stack_depot); + __drm_stack_depot_print(ctx->stack_depot); while (!list_empty(&ctx->locked)) { struct drm_modeset_lock *lock; @@ -286,7 +286,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, int ret; if (WARN_ON(ctx->contended)) - __stack_depot_print(ctx->stack_depot); + __drm_stack_depot_print(ctx->stack_depot); if (ctx->trylock_only) { lockdep_assert_held(&ctx->ww_ctx); @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, ret = 0; } else if (ret == -EDEADLK) { ctx->contended = lock; - ctx->stack_depot = __stack_depot_save(); + ctx->stack_depot = __drm_stack_depot_save(); } return ret; |