git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
drm_crtc_helper.c
diff --git
a/drivers/gpu/drm/drm_crtc_helper.c
b/drivers/gpu/drm/drm_crtc_helper.c
index
a6f73f1
..
3da9cfa
100644
(file)
--- a/
drivers/gpu/drm/drm_crtc_helper.c
+++ b/
drivers/gpu/drm/drm_crtc_helper.c
@@
-1090,6
+1090,8
@@
int drm_helper_resume_force_mode(struct drm_device *dev)
if (ret == false)
DRM_ERROR("failed to set mode on crtc %p\n", crtc);
}
+ /* disable the unused connectors while restoring the modesetting */
+ drm_helper_disable_unused_functions(dev);
return 0;
}
EXPORT_SYMBOL(drm_helper_resume_force_mode);