rpms/kernel/devel patch-2.6.31-rc6-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1112, 1.1113 drm-r600-kms.patch, 1.2, 1.3 kernel.spec, 1.1728, 1.1729 sources, 1.1070, 1.1071 upstream, 1.984, 1.985 fix-perf-make-man-failure.patch, 1.1, NONE patch-2.6.31-rc6-git5.bz2.sign, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9038

Modified Files:
	.cvsignore drm-r600-kms.patch kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc6-git6.bz2.sign 
Removed Files:
	fix-perf-make-man-failure.patch patch-2.6.31-rc6-git5.bz2.sign 
Log Message:
2.6.31-rc6-git5
Fix up drm-r600-kms.patch
Drop fix-perf-make-man-failure.patch


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

iD8DBQBKjOD+yGugalF9Dw4RAuluAJ0apmkqCm9MDipwL6ORh60fDrAU0wCfWd71
WxhBmKqP35ul/Oi1jVkkmfI=
=TDlk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1112
retrieving revision 1.1113
diff -u -p -r1.1112 -r1.1113
--- .cvsignore	19 Aug 2009 12:46:26 -0000	1.1112
+++ .cvsignore	20 Aug 2009 13:30:13 -0000	1.1113
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git5.bz2
+patch-2.6.31-rc6-git6.bz2

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    3 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  139 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  340 ++++----
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  981 +++++++++++++++++++++++-
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 19 files changed, 3366 insertions(+), 498 deletions(-)

Index: drm-r600-kms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-r600-kms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-r600-kms.patch	7 Aug 2009 10:47:28 -0000	1.2
+++ drm-r600-kms.patch	20 Aug 2009 13:30:13 -0000	1.3
@@ -2062,9 +2062,9 @@ index b1d945b..0c5c63a 100644
 @@ -712,6 +739,7 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
  #define RREG8(reg) readb(((void __iomem *)rdev->rmmio) + (reg))
  #define WREG8(reg, v) writeb(v, ((void __iomem *)rdev->rmmio) + (reg))
- #define RREG32(reg) rdev->mm_rreg(rdev, (reg))
+ #define RREG32(reg) r100_mm_rreg(rdev, (reg))
 +#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", rdev->mm_rreg(rdev, (reg)))
- #define WREG32(reg, v) rdev->mm_wreg(rdev, (reg), (v))
+ #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v))
  #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
  #define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
 @@ -735,6 +763,7 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
@@ -2073,8 +2073,8 @@ index b1d945b..0c5c63a 100644
  	} while (0)
 +#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", (rdev)->mm_rreg((rdev), (reg)))
  
- void r100_pll_errata_after_index(struct radeon_device *rdev);
- 
+ /*
+  * Indirect registers accessor
 @@ -844,6 +873,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
   * ASICs macro.
   */
@@ -2170,8 +2170,8 @@ index 9a75876..7e9bb12 100644
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
  	.irq_set = &rs600_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -331,7 +349,10 @@ static struct radeon_asic rs690_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2181,8 +2181,8 @@ index 9a75876..7e9bb12 100644
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
  	.irq_set = &rs600_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -380,7 +401,10 @@ static struct radeon_asic rv515_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2191,9 +2191,9 @@ index 9a75876..7e9bb12 100644
  	.ring_start = &rv515_ring_start,
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
- 	.irq_set = &r100_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_set = &rs600_irq_set,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -422,7 +446,10 @@ static struct radeon_asic r520_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2202,9 +2202,9 @@ index 9a75876..7e9bb12 100644
  	.ring_start = &rv515_ring_start,
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
- 	.irq_set = &r100_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_set = &rs600_irq_set,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -440,9 +467,119 @@ static struct radeon_asic r520_asic = {
  };
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1728
retrieving revision 1.1729
diff -u -p -r1.1728 -r1.1729
--- kernel.spec	19 Aug 2009 12:46:26 -0000	1.1728
+++ kernel.spec	20 Aug 2009 13:30:13 -0000	1.1729
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -718,9 +718,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
-# perf userspace tool patches
-Patch13000: fix-perf-make-man-failure.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1330,8 +1327,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
-ApplyPatch fix-perf-make-man-failure.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1998,6 +1993,11 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 20 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc6-git5
+- Fix up drm-r600-kms.patch
+- Drop fix-perf-make-man-failure.patch
+
 * Wed Aug 19 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc6-git5
 - Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -u -p -r1.1070 -r1.1071
--- sources	19 Aug 2009 12:46:27 -0000	1.1070
+++ sources	20 Aug 2009 13:30:13 -0000	1.1071
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-6128f58fd777f9b64ea5c2fa13049021  patch-2.6.31-rc6-git5.bz2
+bf8a969c68cb72946782195934e6f183  patch-2.6.31-rc6-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -p -r1.984 -r1.985
--- upstream	19 Aug 2009 12:46:27 -0000	1.984
+++ upstream	20 Aug 2009 13:30:14 -0000	1.985
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git5.bz2
+patch-2.6.31-rc6-git6.bz2


--- fix-perf-make-man-failure.patch DELETED ---


--- patch-2.6.31-rc6-git5.bz2.sign DELETED ---