Skip to contentSkip to conversation

drm/helper: lock all around force mode restore

PATCH In review Dave Airlie 2 participants 2 messages Mar 21, 2014

Subsystems (2)
DRM drivers DRM misc
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 drm/helper: lock all around force mode restore

From: Dave Airlie <[email protected]>

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.

Signed-off-by Dave Airlie <[email protected]>
---
 drivers/gpu/drm/drm_crtc_helper.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_crtc_helper.c +2 -0
index 5d2b7a5..c0f2d62 100644
@@ -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);
Signature · 1 line
1.8.3.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dave Airlie

From: Dave Airlie <[email protected]>

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.

Signed-off-by Dave Airlie <[email protected]>

Some drivers have some other modeset gunk around the call to this helper (like cursor frobbing or dpms frobbing) which probably should be moved either to their crtc enable hook or into the core crtc helpers. So I don't think pushing the locking out intro drivers is that useful

Reviewed-by Daniel Vetter <[email protected]>
Quoted 31 lines
---
 drivers/gpu/drm/drm_crtc_helper.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_crtc_helper.c +2 -0
index 5d2b7a5..c0f2d62 100644
@@ -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);
Signature · 6 lines
1.8.3.1

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch