rpms/kernel/F-12 patch-2.6.32.5.bz2.sign, NONE, 1.1 .cvsignore, 1.1141, 1.1142 kernel.spec, 1.1991, 1.1992 linux-2.6-upstream-reverts.patch, 1.5, 1.6 sources, 1.1099, 1.1100 upstream, 1.1013, 1.1014 patch-2.6.32.4.bz2.sign, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16139

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.32.5.bz2.sign 
Removed Files:
	patch-2.6.32.4.bz2.sign 
Log Message:
Linux 2.6.32.5
Revert commit c7c85101afd0cb8ce497456d12ee1cad4aad152f from
  upstream .32.5 because it conflicts with our DRM update.


--- NEW FILE patch-2.6.32.5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLWjXdyGugalF9Dw4RAi4mAJ4gGHLhvMVZt8Y0/4wzl3NJRaoQHQCfeEbF
frDdM5LXEiljhGvjPjpluCc=
=1otH
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1141
retrieving revision 1.1142
diff -u -p -r1.1141 -r1.1142
--- .cvsignore	18 Jan 2010 19:36:39 -0000	1.1141
+++ .cvsignore	23 Jan 2010 03:04:33 -0000	1.1142
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.32
 linux-2.6.32.tar.bz2
-patch-2.6.32.4.bz2
+patch-2.6.32.5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -p -r1.1991 -r1.1992
--- kernel.spec	22 Jan 2010 21:26:14 -0000	1.1991
+++ kernel.spec	23 Jan 2010 03:04:34 -0000	1.1992
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -2027,6 +2027,11 @@ fi
 # and build.
 
 %changelog
+* Sat Jan 23 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.5-32
+- Linux 2.6.32.5
+- Revert commit c7c85101afd0cb8ce497456d12ee1cad4aad152f from
+  upstream .32.5 because it conflicts with our DRM update.
+
 * Sat Jan 23 2010 Dave Airlie <airlied at redhat.com> 2.6.32.4-31
 - fix dracut depends
 

linux-2.6-upstream-reverts.patch:
 i915_irq.c |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-upstream-reverts.patch	12 Nov 2008 16:28:22 -0000	1.5
+++ linux-2.6-upstream-reverts.patch	23 Jan 2010 03:04:34 -0000	1.6
@@ -1 +1,90 @@
-nil
+From c7c85101afd0cb8ce497456d12ee1cad4aad152f Mon Sep 17 00:00:00 2001
+From: Zou Nan hai <Nanhai.zou at intel.com>
+Date: Fri, 15 Jan 2010 10:29:06 +0800
+Subject: drm/i915: remove loop in Ironlake interrupt handler
+
+From: Zou Nan hai <Nanhai.zou at intel.com>
+
+commit c7c85101afd0cb8ce497456d12ee1cad4aad152f upstream.
+
+[[ revert in fedora, conflicts with drm update ]]
+
+On Ironlake, there is an interrupt master control bit. With the bit
+disabled before clearing IIR, we do not need to handle extra interrupt
+in a loop. This patch removes the loop in Ironlake interrupt handler.
+It fixed irq lost issue on some Ironlake platforms.
+
+Signed-off-by: Zou Nan hai <Nanhai.zou at intel.com>
+Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>
+Signed-off-by: Eric Anholt <eric at anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+
+---
+ drivers/gpu/drm/i915/i915_irq.c |   43 ++++++++++++++++------------------------
+ 1 file changed, 18 insertions(+), 25 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -255,7 +255,6 @@ irqreturn_t igdng_irq_handler(struct drm
+ 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ 	int ret = IRQ_NONE;
+ 	u32 de_iir, gt_iir, de_ier;
+-	u32 new_de_iir, new_gt_iir;
+ 	struct drm_i915_master_private *master_priv;
+ 
+ 	/* disable master interrupt before clearing iir  */
+@@ -266,35 +265,29 @@ irqreturn_t igdng_irq_handler(struct drm
+ 	de_iir = I915_READ(DEIIR);
+ 	gt_iir = I915_READ(GTIIR);
+ 
+-	for (;;) {
+-		if (de_iir == 0 && gt_iir == 0)
+-			break;
+-
+-		ret = IRQ_HANDLED;
+-
+-		I915_WRITE(DEIIR, de_iir);
+-		new_de_iir = I915_READ(DEIIR);
+-		I915_WRITE(GTIIR, gt_iir);
+-		new_gt_iir = I915_READ(GTIIR);
++	if (de_iir == 0 && gt_iir == 0)
++		goto done;
+ 
+-		if (dev->primary->master) {
+-			master_priv = dev->primary->master->driver_priv;
+-			if (master_priv->sarea_priv)
+-				master_priv->sarea_priv->last_dispatch =
+-					READ_BREADCRUMB(dev_priv);
+-		}
++	ret = IRQ_HANDLED;
+ 
+-		if (gt_iir & GT_USER_INTERRUPT) {
+-			u32 seqno = i915_get_gem_seqno(dev);
+-			dev_priv->mm.irq_gem_seqno = seqno;
+-			trace_i915_gem_request_complete(dev, seqno);
+-			DRM_WAKEUP(&dev_priv->irq_queue);
+-		}
++	if (dev->primary->master) {
++		master_priv = dev->primary->master->driver_priv;
++		if (master_priv->sarea_priv)
++			master_priv->sarea_priv->last_dispatch =
++				READ_BREADCRUMB(dev_priv);
++	}
+ 
+-		de_iir = new_de_iir;
+-		gt_iir = new_gt_iir;
++	if (gt_iir & GT_USER_INTERRUPT) {
++		u32 seqno = i915_get_gem_seqno(dev);
++		dev_priv->mm.irq_gem_seqno = seqno;
++		trace_i915_gem_request_complete(dev, seqno);
++		DRM_WAKEUP(&dev_priv->irq_queue);
+ 	}
+ 
++	I915_WRITE(GTIIR, gt_iir);
++	I915_WRITE(DEIIR, de_iir);
++
++done:
+ 	I915_WRITE(DEIER, de_ier);
+ 	(void)I915_READ(DEIER);
+ 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1099
retrieving revision 1.1100
diff -u -p -r1.1099 -r1.1100
--- sources	18 Jan 2010 19:36:40 -0000	1.1099
+++ sources	23 Jan 2010 03:04:34 -0000	1.1100
@@ -1,2 +1,2 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-59ede83ff0fce786edacac028a457301  patch-2.6.32.4.bz2
+49e6bc73c7a7f690fe7ddf09fe2b5d06  patch-2.6.32.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -p -r1.1013 -r1.1014
--- upstream	18 Jan 2010 19:36:40 -0000	1.1013
+++ upstream	23 Jan 2010 03:04:34 -0000	1.1014
@@ -1,2 +1,2 @@
 linux-2.6.32.tar.bz2
-patch-2.6.32.4.bz2
+patch-2.6.32.5.bz2


--- patch-2.6.32.4.bz2.sign DELETED ---