drm/atomic: Call ww_acquire_done after drm_modeset_lock_all
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 21 Feb 2018 15:23:31 +0000 (16:23 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 5 Mar 2018 09:35:32 +0000 (10:35 +0100)
After we acquired all generic modeset locks in drm_modeset_lock_all, it's
unsafe acquire any other so just mark acquisition as done.

Atomic drivers shouldn't use drm_modeset_lock_all.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180221152331.9212-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Harry Wentland <harry.wentland@amd.com>
drivers/gpu/drm/drm_modeset_lock.c

index 963e23db0fe71a4813717ed7b28b6b89ec81240b..8a5100685875a38cc0f844c3c57d1273045d585f 100644 (file)
@@ -113,6 +113,7 @@ retry:
                kfree(ctx);
                return;
        }
+       ww_acquire_done(&ctx->ww_ctx);
 
        WARN_ON(config->acquire_ctx);