From 9bffd21ca4887d1194d0718ae96593ac76099196 Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Wed, 8 Jul 2009 14:13:13 +0800 Subject: [PATCH] --- yaml --- r: 155267 b: refs/heads/master c: af4fcb574efa90373b02ae0bb8b54d710c32eeb4 h: refs/heads/master i: 155265: 155406a6ece1ea4711e729bbdb6ab20e8b202861 155263: 3da52288f5954d79c4d4329cfb7c40b2d05f9ec0 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d56add40d3d6..d2042162615b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 354ff96772540d2e836194bf14dd9c05c274055c +refs/heads/master: af4fcb574efa90373b02ae0bb8b54d710c32eeb4 diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c index a6f73f1e99d9..3da9cfa31848 100644 --- a/trunk/drivers/gpu/drm/drm_crtc_helper.c +++ b/trunk/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);