]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm: Move atomic_state_put after locks are dropped
authorSean Paul <seanpaul@chromium.org>
Thu, 29 Nov 2018 15:04:16 +0000 (10:04 -0500)
committerSean Paul <seanpaul@chromium.org>
Thu, 29 Nov 2018 15:48:31 +0000 (10:48 -0500)
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 <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181129150423.239081-3-sean@poorly.run
drivers/gpu/drm/drm_atomic_helper.c

index 8bce94731cd6e86c89a9fa9d96415262a658c2e0..c7380ad3c51bf95814355334acfb95289ee6006d 100644 (file)
@@ -3294,9 +3294,9 @@ int drm_atomic_helper_resume(struct drm_device *dev,
                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;
 }