diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-03-21 10:45:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-22 08:05:32 +1000 |
| commit | 3ea8785503a05a92601ffa209ef7d560d271fa33 (patch) | |
| tree | 697ae6a57143ddfbab5d823a6ebb34022bf14a45 | |
| parent | drm/fb-helper: improve drm_fb_helper_initial_config locking (diff) | |
| download | wireguard-linux-3ea8785503a05a92601ffa209ef7d560d271fa33.tar.xz wireguard-linux-3ea8785503a05a92601ffa209ef7d560d271fa33.zip | |
drm/helper: lock all around force mode restore
Since Daniel documented things with a sledge hammer, we got lots of
nice backtraces in suspend/resume operations, I've check the callers
of this and they all seems safe to me,
This fixes one set of warns I reported.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 5d2b7a5716e6..c0f2d6266070 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -983,6 +983,7 @@ void drm_helper_resume_force_mode(struct drm_device *dev) int encoder_dpms; bool ret; + drm_modeset_lock_all(dev); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { if (!crtc->enabled) @@ -1017,6 +1018,7 @@ void drm_helper_resume_force_mode(struct drm_device *dev) /* disable the unused connectors while restoring the modesetting */ __drm_helper_disable_unused_functions(dev); + drm_modeset_unlock_all(dev); } EXPORT_SYMBOL(drm_helper_resume_force_mode); |