This reapplies commit 992cbf19b32900efa17850b9fa0031fd623edd4d. With atomic drm_framebuffer_remove and the fbdev emulation layer atomic this should be safe to apply again.
Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: Rob Clark robdclark@gmail.com Cc: Daniel Vetter daniel.vetter@intel.com --- drivers/gpu/drm/drm_atomic.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 5a54d9e2d938..d619a756587c 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1358,6 +1358,9 @@ int drm_atomic_check_only(struct drm_atomic_state *state) } }
+ if (ret == 0) + ww_acquire_done(&state->acquire_ctx->ww_ctx); + return ret; } EXPORT_SYMBOL(drm_atomic_check_only);