[PATCH] UBUNTU: SAUCE: drm/i915: Disable FBC on 915GM and 945GM

[Andy Whitcroft]

On Tue, Mar 30, 2010 at 12:46:57PM -0500, Steve Conklin wrote:
> Patch is attached (At the moment I have only broken mailers working
> which munge patches)
> 
> Patch has been accepted by upstream but isn't in Linus's tree yet.
> 
> Steve

> From f41026f152469afd0f708030e259e057986b693f Mon Sep 17 00:00:00 2001
> From: Steve Conklin <sconklin at canonical.com>
> Date: Mon, 29 Mar 2010 14:45:40 -0500
> Subject: [PATCH] UBUNTU: SAUCE: drm/i915: Disable FBC on 915GM and 945GM
> 
> 945 class Intel hardware has several problems related to FBC.
> These are prevented by disabling it on these devices.
> 
> This patch has been accepted by upstream but has not made it into
> Linus's tree yet.
> 
> BugLink: http://bugs.launchpad.net/bugs/492392
> 
> Signed-off-by: Robert Hooker <sarvatt at ubuntu.com>
> Signed-off-by: Steve Conklin <sconklin at canonical.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 cf4cb3e..4746bfe 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -79,14 +79,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 b27202d..0d4c401 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4683,7 +4683,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;
> -- 

I have tested this one extensivly too and it looks to be a good one.

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw