[Frugalware-git] kernel30: kernel-3.0-1-i686

[Michel Hermier]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel30.git;a=commitdiff;h=ee2903c90c14b989769e4c550b5413aa1eab4286

commit ee2903c90c14b989769e4c550b5413aa1eab4286
Author: Michel Hermier <hermier at frugalware.org>
Date:   Sun Aug 14 10:58:47 2011 +0200

kernel-3.0-1-i686

* Prepare for release.

diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild
index 41d2da8..2fdb104 100644
--- a/source/base/kernel/FrugalBuild
+++ b/source/base/kernel/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-"n"}

if ! Fuse $USE_DEVEL; then
-	_F_kernel_patches=(b6c6e0b06473587f5e375eb2f1ac247d13fecade.patch)
+	_F_kernel_patches=('fix-i915.patch')
else
# example for a tagged rc release: 2.6.32.rc5
# example for a random snapshot (based on git describe output): 2.6.32.rc5.81.g964fe08
diff --git a/source/base/kernel/b6c6e0b06473587f5e375eb2f1ac247d13fecade.patch b/source/base/kernel/b6c6e0b06473587f5e375eb2f1ac247d13fecade.patch
deleted file mode 100644
index 9fa3062..0000000
--- a/source/base/kernel/b6c6e0b06473587f5e375eb2f1ac247d13fecade.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b6c6e0b06473587f5e375eb2f1ac247d13fecade Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs at redhat.com>
-Date: Sun, 29 May 2011 23:28:31 +0000
-Subject: drm/nouveau: fix leak of gart mm node
-
-Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
----
-diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
-index 2960f58..f9efbbb 100644
---- a/drivers/gpu/drm/nouveau/nouveau_mem.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
-@@ -868,7 +868,9 @@ nouveau_gart_manager_del(struct ttm_mem_type_manager *man,
- 		nouveau_vm_unmap(&node->tmp_vma);
- 		nouveau_vm_put(&node->tmp_vma);
- 	}
-+
- 	mem->mm_node = NULL;
-+	kfree(node);
- }
-
- static int
---
-cgit v0.8.3-6-g21f6
diff --git a/source/base/kernel/fix-i915.patch b/source/base/kernel/fix-i915.patch
new file mode 100644
index 0000000..3b63136
--- /dev/null
+++ b/source/base/kernel/fix-i915.patch
@@ -0,0 +1,26 @@
+Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
+Tested-by: Santi <santi at agolina.net>
+---
+ drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
+index dc83b7a..c8f67bf 100644
+--- a/drivers/gpu/drm/i915/intel_tv.c
++++ b/drivers/gpu/drm/i915/intel_tv.c
+@@ -1267,6 +1267,15 @@
+ 		   DAC_B_0_7_V |
+ 		   DAC_C_0_7_V);
+
++	/*
++	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
++	 * the TV is misdetected. This is hardware requirement.
++	 */
++	if (IS_GM45(dev))
++		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
++			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
++
++
+ 	I915_WRITE(TV_CTL, tv_ctl);
+ 	I915_WRITE(TV_DAC, tv_dac);
+ 	POSTING_READ(TV_DAC);