Attachment 357165 Details for Bug 596844

[patch] drm-i915-disable-fbc-on-gm45-and-965gm.diff

drm-i915-disable-fbc-on-gm45-and-965gm.diff (text/plain), 1.80 KB, created by Stefan Dirsch on 2010-04-27 16:55:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2010-04-27 16:55:28 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index cc03537..8526fab 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -98,7 +98,7 @@ const static struct intel_device_info intel_i965g_info = {
> 
> const static struct intel_device_info intel_i965gm_info = {
> 	.is_i965g = 1, .is_mobile = 1, .is_i965gm = 1, .is_i9xx = 1,
>-	.is_mobile = 1, .has_fbc = 1, .has_rc6 = 1,
>+	.is_mobile = 1, .has_rc6 = 1,
> 	.has_hotplug = 1,
> };
> 
>@@ -115,7 +115,7 @@ const static struct intel_device_info intel_g45_info = {
> 
> const static struct intel_device_info intel_gm45_info = {
> 	.is_i965g = 1, .is_mobile = 1, .is_g4x = 1, .is_i9xx = 1,
>-	.is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1,
>+	.is_mobile = 1, .need_gfx_hws = 1, .has_rc6 = 1,
> 	.has_pipe_cxsr = 1,
> 	.has_hotplug = 1,
> };
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index c7502b6..03c3b26 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -4809,20 +4809,6 @@ static void intel_init_display(struct drm_device *dev)
> 	else
> 		dev_priv->display.dpms = i9xx_crtc_dpms;
> 
>-	/* Only mobile has FBC, leave pointers NULL for other chips */
>-	if (IS_MOBILE(dev)) {
>-		if (IS_GM45(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)) {
>-			dev_priv->display.fbc_enabled = i8xx_fbc_enabled;
>-			dev_priv->display.enable_fbc = i8xx_enable_fbc;
>-			dev_priv->display.disable_fbc = i8xx_disable_fbc;
>-		}
>-		/* 855GM needs testing */
>-	}
>-
> 	/* Returns the core display clock speed */
> 	if (IS_I945G(dev) || (IS_G33(dev) && ! IS_PINEVIEW_M(dev)))
> 		dev_priv->display.get_display_clock_speed =

Actions: View | Diff

Attachments on bug 596844: 357165