rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

revert drm i915 enable rc6 on ironlake

Browse Source
This commit is contained in:
Kyle McMartin 2010-09-07 11:39:39 -04:00
parent 818f303e6d
commit 5d4ac2732c
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so # For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3 # for example a 3 here will become 0.3
# #
%global baserelease 16 %global baserelease 17
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -658,6 +658,7 @@ Patch1824: drm-intel-next.patch
# make sure the lvds comes back on lid open # make sure the lvds comes back on lid open
Patch1825: drm-intel-make-lvds-work.patch Patch1825: drm-intel-make-lvds-work.patch
Patch1900: linux-2.6-intel-iommu-igfx.patch Patch1900: linux-2.6-intel-iommu-igfx.patch
Patch1901: revert-drm-i915-enable-rc6-on-ironlake.patch
# linux1394 git patches # linux1394 git patches
Patch2200: linux-2.6-firewire-git-update.patch Patch2200: linux-2.6-firewire-git-update.patch
@ -1240,6 +1241,7 @@ ApplyPatch drm-intel-big-hammer.patch
ApplyOptionalPatch drm-intel-next.patch ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-intel-make-lvds-work.patch ApplyPatch drm-intel-make-lvds-work.patch
ApplyPatch linux-2.6-intel-iommu-igfx.patch ApplyPatch linux-2.6-intel-iommu-igfx.patch
ApplyPatch revert-drm-i915-enable-rc6-on-ironlake.patch
# linux1394 git patches # linux1394 git patches
#ApplyPatch linux-2.6-firewire-git-update.patch #ApplyPatch linux-2.6-firewire-git-update.patch
@ -1880,6 +1882,10 @@ fi
# || || # || ||
%changelog %changelog
* Tue Sep 07 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.17.rc3.git0
- Revert ce171780 which breaks my graphics on resume.
(drm/i915: Enable RC6 on Ironlake.)
* Fri Sep 03 2010 Kyle McMartin <kyle@redhat.com> * Fri Sep 03 2010 Kyle McMartin <kyle@redhat.com>
- Restore AppleIR USB driver which got lost between F-13 and now. - Restore AppleIR USB driver which got lost between F-13 and now.

41
revert-drm-i915-enable-rc6-on-ironlake.patch Normal file
View File

@ -0,0 +1,41 @@
From c21a31aebb5d8f0b3ad050a8f3190b6de8210845 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
Date: Tue, 7 Sep 2010 09:45:00 -0400
Subject: Revert "drm/i915: Enable RC6 on Ironlake."
This reverts commit ce17178094f368d9e3f39b2cb4303da5ed633dd4.
---
drivers/gpu/drm/i915/intel_display.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 11a3394..36952e9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5722,8 +5722,7 @@ void intel_init_clock_gating(struct drm_device *dev)
ILK_DPFC_DIS2 |
ILK_CLK_FBC);
}
- if (IS_GEN6(dev))
- return;
+ return;
} else if (IS_G4X(dev)) {
uint32_t dspclk_gate;
I915_WRITE(RENCLK_GATE_D1, 0);
@@ -5784,11 +5783,9 @@ void intel_init_clock_gating(struct drm_device *dev)
OUT_RING(MI_FLUSH);
ADVANCE_LP_RING();
}
- } else {
+ } else
DRM_DEBUG_KMS("Failed to allocate render context."
- "Disable RC6\n");
- return;
- }
+ "Disable RC6\n");
}
if (I915_HAS_RC6(dev) && drm_core_check_feature(dev, DRIVER_MODESET)) {
--
1.7.2.2