Merge pull request #2335 from fritsch/rc6-disable-intel-snb-gt1

Only disable RC6 on Sandybridge GT1 and not on all intel hardware
This commit is contained in:
Stephan Raue 2013-06-06 15:06:17 -07:00
commit b24928e93f
6 changed files with 18 additions and 5 deletions

View File

@ -0,0 +1,13 @@
--- a/drivers/gpu/drm/i915/intel_pm.c 2013-05-30 22:57:09.098080381 +0200
+++ b/drivers/gpu/drm/i915/intel_pm.c 2013-05-30 23:31:31.644308032 +0200
@@ -2503,8 +2503,8 @@
if (i915_enable_rc6 >= 0)
return i915_enable_rc6;
- /* Disable RC6 on Ironlake */
- if (INTEL_INFO(dev)->gen == 5)
+ /* Disable RC6 on Ironlake and Sandybridge GT1 */
+ if (INTEL_INFO(dev)->gen == 5 || IS_SNB_GT1(dev))
return 0;
if (IS_HASWELL(dev)) {

View File

@ -434,7 +434,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

View File

@ -408,7 +408,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

View File

@ -434,7 +434,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

View File

@ -433,7 +433,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

View File

@ -400,7 +400,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y