[Intel-gfx] [PATCH] drm/i915: Disable FBC on 915GM and 945GM.

[ykzhao]

On Sat, 2010-03-20 at 03:13 +0800, Robert Hooker wrote:
> It is causing hangs after a suspend/resume cycle with the default
> powersave=1 module option on these chipsets since 2.6.32-rc.

Hi, Robert
    Do you mean that the suspend/resume can work well if the FBC is
disabled?
    Does the system work well if we do the suspend/resume under the
console mode?(We boot the system into X environment and switch to the
console mode). 
    
Thanks.
    Yakui 
> 
> BugLink: http://bugs.launchpad.net/bugs/492392
> Signed-off-by: Robert Hooker <sarvatt at ubuntu.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c      |    4 ++--
>  drivers/gpu/drm/i915/intel_display.c |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 1b2e954..1bfca96 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -80,14 +80,14 @@ const static struct intel_device_info intel_i915g_info = {
>  	.is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1,
>  };
>  const static struct intel_device_info intel_i915gm_info = {
> -	.is_i9xx = 1,  .is_mobile = 1, .has_fbc = 1,
> +	.is_i9xx = 1,  .is_mobile = 1,
>  	.cursor_needs_physical = 1,
>  };
>  const static struct intel_device_info intel_i945g_info = {
>  	.is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1,
>  };
>  const static struct intel_device_info intel_i945gm_info = {
> -	.is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, .has_fbc = 1,
> +	.is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1,
>  	.has_hotplug = 1, .cursor_needs_physical = 1,
>  };
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 9cd6de5..9984eb1 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4800,7 +4800,7 @@ static void intel_init_display(struct drm_device *dev)
>  			dev_priv->display.fbc_enabled = g4x_fbc_enabled;
>  			dev_priv->display.enable_fbc = g4x_enable_fbc;
>  			dev_priv->display.disable_fbc = g4x_disable_fbc;
> -		} else if (IS_I965GM(dev) || IS_I945GM(dev) || IS_I915GM(dev)) {
> +		} else if (IS_I965GM(dev)) {
>  			dev_priv->display.fbc_enabled = i8xx_fbc_enabled;
>  			dev_priv->display.enable_fbc = i8xx_enable_fbc;
>  			dev_priv->display.disable_fbc = i8xx_disable_fbc;