Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d06a1e1 authored by Robert Hooker's avatar Robert Hooker Committed by Eric Anholt
Browse files

drm/i915: Disable FBC on 915GM and 945GM. 

It is causing hangs after a suspend/resume cycle with the default
powersave=1 module option on these chipsets since 2.6.32-rc.

BugLink: http://bugs.launchpad.net/bugs/492392


Signed-off-by: default avatarRobert Hooker <sarvatt@ubuntu.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 01e77706

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -80,14 +80,14 @@ const static struct intel_device_info intel_i915g_info = { 
	.is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1,

	.is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1,

};

};

const static struct intel_device_info intel_i915gm_info = {

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,

	.cursor_needs_physical = 1,

};

};

const static struct intel_device_info intel_i945g_info = {

const static struct intel_device_info intel_i945g_info = {

	.is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1,

	.is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1,

};

};

const static struct intel_device_info intel_i945gm_info = {

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,

	.has_hotplug = 1, .cursor_needs_physical = 1,

};

};

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4814,7 +4814,7 @@ static void intel_init_display(struct drm_device *dev) 
			dev_priv->display.fbc_enabled = g4x_fbc_enabled;

			dev_priv->display.fbc_enabled = g4x_fbc_enabled;

			dev_priv->display.enable_fbc = g4x_enable_fbc;

			dev_priv->display.enable_fbc = g4x_enable_fbc;

			dev_priv->display.disable_fbc = g4x_disable_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.fbc_enabled = i8xx_fbc_enabled;

			dev_priv->display.enable_fbc = i8xx_enable_fbc;

			dev_priv->display.enable_fbc = i8xx_enable_fbc;

			dev_priv->display.disable_fbc = i8xx_disable_fbc;

			dev_priv->display.disable_fbc = i8xx_disable_fbc;