Skip to content

Commit

Permalink
FROMGIT: drm: Move atomic_state_put after locks are dropped
Browse files Browse the repository at this point in the history
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
(cherry picked from commit 2aa3eef)
(am from git://anongit.freedesktop.org/drm/drm)

BUG=None
TEST=Tested on cheza, boots and display comes up

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Change-Id: If418c7897818275d559ad6f36d747537932a4f58
Reviewed-on: https://chromium-review.googlesource.com/1439574
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
  • Loading branch information
atseanpaul authored and chrome-bot committed Jan 30, 2019
1 parent 853e373 commit 681f9b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_atomic_helper.c
Expand Up @@ -3255,9 +3255,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;
}
Expand Down

0 comments on commit 681f9b7

Please sign in to comment.