summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-02-21 16:23:31 +0100
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-03-05 10:35:32 +0100
commit5fcdc9d9816266c575ef21586327ba04d7db5c2c (patch)
tree740a7f5ac5982cf7a96792d21de81f4016554ce1
parentc8624ede3ed3b9f46364f5239c402393ec853e00 (diff)
downloadlinux-5fcdc9d9816266c575ef21586327ba04d7db5c2c.tar.bz2
drm/atomic: Call ww_acquire_done after drm_modeset_lock_all
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>
-rw-r--r--drivers/gpu/drm/drm_modeset_lock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 963e23db0fe7..8a5100685875 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -113,6 +113,7 @@ retry:
kfree(ctx);
return;
}
+ ww_acquire_done(&ctx->ww_ctx);
WARN_ON(config->acquire_ctx);