diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2009-07-08 14:13:12 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-07-10 12:36:11 -0700 |
| commit | 354ff96772540d2e836194bf14dd9c05c274055c (patch) | |
| tree | 95074170d99ce6d64c25178a07f915242d0f8ba1 /drivers | |
| parent | 883e860daf5c75a0035c33cb6f8881ee62d6efaf (diff) | |
| download | blackbird-op-linux-354ff96772540d2e836194bf14dd9c05c274055c.tar.gz blackbird-op-linux-354ff96772540d2e836194bf14dd9c05c274055c.zip | |
drm/i915: Restore the KMS modeset for every activated CRTC
Restore the modeset for every activated CRTC in course of resume.
This is realized by calling the function of drm_helper_resume_force_mode.
Note: it is meaningful only for the KMS mode.
https://bugs.freedesktop.org/show_bug.cgi?id=21719
https://bugs.freedesktop.org/show_bug.cgi?id=21708
https://bugs.freedesktop.org/show_bug.cgi?id=22285
https://bugs.freedesktop.org/show_bug.cgi?id=22263
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index aef2a261a837..fc4b68aa2d05 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -35,6 +35,7 @@ #include "drm_pciids.h" #include <linux/console.h> +#include "drm_crtc_helper.h" static unsigned int i915_modeset = -1; module_param_named(modeset, i915_modeset, int, 0400); @@ -115,6 +116,10 @@ static int i915_resume(struct drm_device *dev) drm_irq_install(dev); } + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + /* Resume the modeset for every activated CRTC */ + drm_helper_resume_force_mode(dev); + } return ret; } |
