[Intel-gfx] [DRM/I915]: Restore the modeset for every activated CRTC

[Eric Anholt]

On Thu, 2009-07-02 at 15:16 +0800, yakui.zhao at intel.com wrote:
> From: Zhao Yakui <yakui.zhao at intel.com>
> 
> 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.
> 
> Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> Index: linux-2.6/drivers/gpu/drm/i915/i915_drv.c
> ===================================================================
> --- linux-2.6.orig/drivers/gpu/drm/i915/i915_drv.c	2009-07-02 14:24:44.000000000 +0800
> +++ linux-2.6/drivers/gpu/drm/i915/i915_drv.c	2009-07-02 14:25:52.000000000 +0800
> @@ -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 @@
>  
>  		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;
>  }

So, this patch does a full modeset on top of the almost-full modeset
done by the suspend/resume code.  That seems bogus -- if we're going to
do this, we shouldn't do the rest of the save/restore for mdoesetting.
However, note that drm_helper_resume_force_mode doesn't turn off
disabled connectors, which seems wrong.

-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090707/b0e0741e/attachment.sig>