From: Sean Paul Date: Thu, 29 Nov 2018 15:04:16 +0000 (-0500) Subject: drm: Move atomic_state_put after locks are dropped X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2aa3eef85d4ac3843f4972269dbd39557e0ec0eb;p=openwrt%2Fstaging%2Fblogic.git drm: Move atomic_state_put after locks are dropped drm_atomic_state_put doesn't require any locking, and this makes things easier for switching to modeset_lock_all helpers in a future patch Changes in v2: - Moved state->acquire_ctx clear to a separate patch (Daniel) Reviewed-by: Daniel Vetter Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20181129150423.239081-3-sean@poorly.run --- diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 8bce94731cd6..c7380ad3c51b 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3294,9 +3294,9 @@ out: drm_modeset_backoff(&ctx); } - drm_atomic_state_put(state); drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); + drm_atomic_state_put(state); return err; }