[packages/kernel.git] / 2.6.1-all-in-1.patch

diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/arch/i386/Kconfig linux-2.6.1-gentoo-test/arch/i386/Kconfig
--- linux-2.6.1-gentoo/arch/i386/Kconfig	2004-01-09 23:40:12.000000000 +0000
+++ linux-2.6.1-gentoo-test/arch/i386/Kconfig	2004-01-09 22:33:09.000000000 +0000
@@ -586,6 +586,9 @@
 	  Say Y if you intend to run this kernel on a Dell Inspiron 8000.
 	  Say N otherwise.
 
+config OMNIBOOK
+	tristate "HP Omnibook Support"
+
 config MICROCODE
 	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
 	---help---
diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/arch/i386/kernel/cpu/cpufreq/powernow-k7.c linux-2.6.1-gentoo-test/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
--- linux-2.6.1-gentoo/arch/i386/kernel/cpu/cpufreq/powernow-k7.c	2004-01-09 23:40:12.000000000 +0000
+++ linux-2.6.1-gentoo-test/arch/i386/kernel/cpu/cpufreq/powernow-k7.c	2004-01-09 22:32:23.000000000 +0000
@@ -279,6 +279,8 @@
 	etuple &= 0xf00;
 	etuple |= (c->x86_model<<4)|(c->x86_mask);
 
+	if (etuple == 0x7a0) { etuple = 0x781; }
+
 	for (i=0xC0000; i < 0xffff0 ; i+=16) {
 
 		p = phys_to_virt(i);
diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/Makefile linux-2.6.1-gentoo-test/drivers/char/Makefile
--- linux-2.6.1-gentoo/drivers/char/Makefile	2004-01-09 23:40:12.000000000 +0000
+++ linux-2.6.1-gentoo-test/drivers/char/Makefile	2004-01-09 22:33:09.000000000 +0000
@@ -61,6 +61,7 @@
 endif
 obj-$(CONFIG_TOSHIBA) += toshiba.o
 obj-$(CONFIG_I8K) += i8k.o
+obj-$(CONFIG_OMNIBOOK) += omnibook/
 obj-$(CONFIG_DS1620) += ds1620.o
 obj-$(CONFIG_HW_RANDOM) += hw_random.o
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_cp.c linux-2.6.1-gentoo-test/drivers/char/drm/radeon_cp.c
--- linux-2.6.1-gentoo/drivers/char/drm/radeon_cp.c	2004-01-09 23:40:12.000000000 +0000
+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_cp.c	2004-01-09 23:33:45.000000000 +0000
@@ -855,7 +855,8 @@
 
 	/* Initialize the memory controller */
 	RADEON_WRITE( RADEON_MC_FB_LOCATION,
-		      (dev_priv->gart_vm_start - 1) & 0xffff0000 );
+		      ((dev_priv->gart_vm_start - 1) & 0xffff0000 ) |
+		      (dev_priv->fb_base >> 16));
 
 #if __REALLY_HAVE_AGP
 	if ( !dev_priv->is_pci ) {
@@ -1071,13 +1072,6 @@
 	dev_priv->depth_offset	= init->depth_offset;
 	dev_priv->depth_pitch	= init->depth_pitch;
 
-	dev_priv->front_pitch_offset = (((dev_priv->front_pitch/64) << 22) |
-					(dev_priv->front_offset >> 10));
-	dev_priv->back_pitch_offset = (((dev_priv->back_pitch/64) << 22) |
-				       (dev_priv->back_offset >> 10));
-	dev_priv->depth_pitch_offset = (((dev_priv->depth_pitch/64) << 22) |
-					(dev_priv->depth_offset >> 10));
-
 	/* Hardware state for depth clears.  Remove this if/when we no
 	 * longer clear the depth buffer with a 3D rectangle.  Hard-code
 	 * all values to prevent unwanted 3D state from slipping through
@@ -1204,9 +1198,17 @@
 			   dev_priv->buffers->handle );
 	}
 
+	dev_priv->fb_base = (RADEON_READ( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
+        dev_priv->front_pitch_offset = (((dev_priv->front_pitch/64) << 22) |
+                                       ((dev_priv->front_offset+dev_priv->fb_base) >> 10));
+        dev_priv->back_pitch_offset = (((dev_priv->back_pitch/64) << 22) |
+                                      ((dev_priv->back_offset+dev_priv->fb_base) >> 10));
+        dev_priv->depth_pitch_offset = (((dev_priv->depth_pitch/64) << 22) |
+                                       ((dev_priv->depth_offset+dev_priv->fb_base) >> 10));
 
 	dev_priv->gart_size = init->gart_size;
-	dev_priv->gart_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE );
+	dev_priv->gart_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE ) + dev_priv->fb_base;
+
 #if __REALLY_HAVE_AGP
 	if ( !dev_priv->is_pci )
 		dev_priv->gart_buffers_offset = (dev_priv->buffers->offset
diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_drv.h linux-2.6.1-gentoo-test/drivers/char/drm/radeon_drv.h
--- linux-2.6.1-gentoo/drivers/char/drm/radeon_drv.h	2004-01-09 23:40:12.000000000 +0000
+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_drv.h	2004-01-09 22:32:40.000000000 +0000
@@ -125,6 +125,7 @@
 
 	drm_radeon_depth_clear_t depth_clear;
 	
+	unsigned long fb_base;
 	unsigned long fb_offset;
 	unsigned long mmio_offset;
 	unsigned long ring_offset;
@@ -146,7 +147,6 @@
 	/* SW interrupt */
    	wait_queue_head_t swi_queue;
    	atomic_t swi_emitted;
-
 } drm_radeon_private_t;
 
 typedef struct drm_radeon_buf_priv {
diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_state.c linux-2.6.1-gentoo-test/drivers/char/drm/radeon_state.c
--- linux-2.6.1-gentoo/drivers/char/drm/radeon_state.c	2004-01-09 23:40:12.000000000 +0000
+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_state.c	2004-01-09 22:32:40.000000000 +0000
@@ -153,7 +153,7 @@
 		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_0, 5 ) );
 		OUT_RING( tex[0].pp_txfilter );
 		OUT_RING( tex[0].pp_txformat );
-		OUT_RING( tex[0].pp_txoffset );
+		OUT_RING( tex[0].pp_txoffset + dev_priv->fb_base);
 		OUT_RING( tex[0].pp_txcblend );
 		OUT_RING( tex[0].pp_txablend );
 		OUT_RING( tex[0].pp_tfactor );
@@ -167,7 +167,7 @@
 		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_1, 5 ) );
 		OUT_RING( tex[1].pp_txfilter );
 		OUT_RING( tex[1].pp_txformat );
-		OUT_RING( tex[1].pp_txoffset );
+		OUT_RING( tex[1].pp_txoffset + dev_priv->fb_base);
 		OUT_RING( tex[1].pp_txcblend );
 		OUT_RING( tex[1].pp_txablend );
 		OUT_RING( tex[1].pp_tfactor );
@@ -181,7 +181,7 @@
 		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_2, 5 ) );
 		OUT_RING( tex[2].pp_txfilter );
 		OUT_RING( tex[2].pp_txformat );
-		OUT_RING( tex[2].pp_txoffset );
+		OUT_RING( tex[2].pp_txoffset + dev_priv->fb_base);
 		OUT_RING( tex[2].pp_txcblend );
 		OUT_RING( tex[2].pp_txablend );
 		OUT_RING( tex[2].pp_tfactor );
@@ -1178,7 +1178,7 @@
 			     RADEON_GMC_CLR_CMP_CNTL_DIS |
 			     RADEON_GMC_WR_MSK_DIS);
 		
-		buffer[2] = (tex->pitch << 22) | (tex->offset >> 10);
+		buffer[2] = (tex->pitch << 22) | ((tex->offset + dev_priv->fb_base) >> 10);
 		buffer[3] = 0xffffffff;
 		buffer[4] = 0xffffffff;
 		buffer[5] = (image->y << 16) | image->x;
diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/omnibook/Makefile linux-2.6.1-gentoo-test/drivers/char/omnibook/Makefile
--- linux-2.6.1-gentoo/drivers/char/omnibook/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.1-gentoo-test/drivers/char/omnibook/Makefile	2004-01-09 22:33:10.000000000 +0000
@@ -0,0 +1,37 @@
+#
+# Makefile -- makefile for the HP OmniBook support module
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any
+# later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
Commit	Line	Data
b37883da	1	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/arch/i386/Kconfig linux-2.6.1-gentoo-test/arch/i386/Kconfig
	2	--- linux-2.6.1-gentoo/arch/i386/Kconfig 2004-01-09 23:40:12.000000000 +0000
	3	+++ linux-2.6.1-gentoo-test/arch/i386/Kconfig 2004-01-09 22:33:09.000000000 +0000
	4	@@ -586,6 +586,9 @@
	5	Say Y if you intend to run this kernel on a Dell Inspiron 8000.
	6	Say N otherwise.
	7
	8	+config OMNIBOOK
	9	+ tristate "HP Omnibook Support"
	10	+
	11	config MICROCODE
	12	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
	13	---help---
	14	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/arch/i386/kernel/cpu/cpufreq/powernow-k7.c linux-2.6.1-gentoo-test/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
	15	--- linux-2.6.1-gentoo/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-01-09 23:40:12.000000000 +0000
	16	+++ linux-2.6.1-gentoo-test/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-01-09 22:32:23.000000000 +0000
	17	@@ -279,6 +279,8 @@
	18	etuple &= 0xf00;
	19	etuple \|= (c->x86_model<<4)\|(c->x86_mask);
	20
	21	+ if (etuple == 0x7a0) { etuple = 0x781; }
	22	+
	23	for (i=0xC0000; i < 0xffff0 ; i+=16) {
	24
	25	p = phys_to_virt(i);
	26	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/drivers/char/Makefile linux-2.6.1-gentoo-test/drivers/char/Makefile
	27	--- linux-2.6.1-gentoo/drivers/char/Makefile 2004-01-09 23:40:12.000000000 +0000
	28	+++ linux-2.6.1-gentoo-test/drivers/char/Makefile 2004-01-09 22:33:09.000000000 +0000
	29	@@ -61,6 +61,7 @@
	30	endif
	31	obj-$(CONFIG_TOSHIBA) += toshiba.o
	32	obj-$(CONFIG_I8K) += i8k.o
	33	+obj-$(CONFIG_OMNIBOOK) += omnibook/
	34	obj-$(CONFIG_DS1620) += ds1620.o
	35	obj-$(CONFIG_HW_RANDOM) += hw_random.o
	36	obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
	37	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_cp.c linux-2.6.1-gentoo-test/drivers/char/drm/radeon_cp.c
	38	--- linux-2.6.1-gentoo/drivers/char/drm/radeon_cp.c 2004-01-09 23:40:12.000000000 +0000
	39	+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_cp.c 2004-01-09 23:33:45.000000000 +0000
	40	@@ -855,7 +855,8 @@
	41
	42	/* Initialize the memory controller */
	43	RADEON_WRITE( RADEON_MC_FB_LOCATION,
	44	- (dev_priv->gart_vm_start - 1) & 0xffff0000 );
	45	+ ((dev_priv->gart_vm_start - 1) & 0xffff0000 ) \|
	46	+ (dev_priv->fb_base >> 16));
	47
	48	#if __REALLY_HAVE_AGP
	49	if ( !dev_priv->is_pci ) {
	50	@@ -1071,13 +1072,6 @@
	51	dev_priv->depth_offset = init->depth_offset;
	52	dev_priv->depth_pitch = init->depth_pitch;
	53
	54	- dev_priv->front_pitch_offset = (((dev_priv->front_pitch/64) << 22) \|
	55	- (dev_priv->front_offset >> 10));
	56	- dev_priv->back_pitch_offset = (((dev_priv->back_pitch/64) << 22) \|
	57	- (dev_priv->back_offset >> 10));
	58	- dev_priv->depth_pitch_offset = (((dev_priv->depth_pitch/64) << 22) \|
	59	- (dev_priv->depth_offset >> 10));
	60	-
	61	/* Hardware state for depth clears. Remove this if/when we no
	62	* longer clear the depth buffer with a 3D rectangle. Hard-code
	63	* all values to prevent unwanted 3D state from slipping through
	64	@@ -1204,9 +1198,17 @@
65	dev_priv->buffers->handle );
66	}
67
68	+ dev_priv->fb_base = (RADEON_READ( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
69	+ dev_priv->front_pitch_offset = (((dev_priv->front_pitch/64) << 22) \|
70	+ ((dev_priv->front_offset+dev_priv->fb_base) >> 10));
71	+ dev_priv->back_pitch_offset = (((dev_priv->back_pitch/64) << 22) \|
72	+ ((dev_priv->back_offset+dev_priv->fb_base) >> 10));
73	+ dev_priv->depth_pitch_offset = (((dev_priv->depth_pitch/64) << 22) \|
74	+ ((dev_priv->depth_offset+dev_priv->fb_base) >> 10));
75
76	dev_priv->gart_size = init->gart_size;
77	- dev_priv->gart_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE );
78	+ dev_priv->gart_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE ) + dev_priv->fb_base;
79	+
80	#if __REALLY_HAVE_AGP
81	if ( !dev_priv->is_pci )
82	dev_priv->gart_buffers_offset = (dev_priv->buffers->offset
83	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_drv.h linux-2.6.1-gentoo-test/drivers/char/drm/radeon_drv.h
84	--- linux-2.6.1-gentoo/drivers/char/drm/radeon_drv.h 2004-01-09 23:40:12.000000000 +0000
85	+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_drv.h 2004-01-09 22:32:40.000000000 +0000
86	@@ -125,6 +125,7 @@
87
88	drm_radeon_depth_clear_t depth_clear;
89
90	+ unsigned long fb_base;
91	unsigned long fb_offset;
92	unsigned long mmio_offset;
93	unsigned long ring_offset;
94	@@ -146,7 +147,6 @@
95	/* SW interrupt */
96	wait_queue_head_t swi_queue;
97	atomic_t swi_emitted;
98	-
99	} drm_radeon_private_t;
100
101	typedef struct drm_radeon_buf_priv {
102	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_state.c linux-2.6.1-gentoo-test/drivers/char/drm/radeon_state.c
103	--- linux-2.6.1-gentoo/drivers/char/drm/radeon_state.c 2004-01-09 23:40:12.000000000 +0000
104	+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_state.c 2004-01-09 22:32:40.000000000 +0000
105	@@ -153,7 +153,7 @@
106	OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_0, 5 ) );
107	OUT_RING( tex[0].pp_txfilter );
108	OUT_RING( tex[0].pp_txformat );
109	- OUT_RING( tex[0].pp_txoffset );
110	+ OUT_RING( tex[0].pp_txoffset + dev_priv->fb_base);
111	OUT_RING( tex[0].pp_txcblend );
112	OUT_RING( tex[0].pp_txablend );
113	OUT_RING( tex[0].pp_tfactor );
114	@@ -167,7 +167,7 @@
115	OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_1, 5 ) );
116	OUT_RING( tex[1].pp_txfilter );
117	OUT_RING( tex[1].pp_txformat );
118	- OUT_RING( tex[1].pp_txoffset );
119	+ OUT_RING( tex[1].pp_txoffset + dev_priv->fb_base);
120	OUT_RING( tex[1].pp_txcblend );
121	OUT_RING( tex[1].pp_txablend );
122	OUT_RING( tex[1].pp_tfactor );
123	@@ -181,7 +181,7 @@
124	OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_2, 5 ) );
125	OUT_RING( tex[2].pp_txfilter );
126	OUT_RING( tex[2].pp_txformat );
127	- OUT_RING( tex[2].pp_txoffset );
128	+ OUT_RING( tex[2].pp_txoffset + dev_priv->fb_base);
129	OUT_RING( tex[2].pp_txcblend );
130	OUT_RING( tex[2].pp_txablend );
131	OUT_RING( tex[2].pp_tfactor );
132	@@ -1178,7 +1178,7 @@
133	RADEON_GMC_CLR_CMP_CNTL_DIS \|
134	RADEON_GMC_WR_MSK_DIS);
135
136	- buffer[2] = (tex->pitch << 22) \| (tex->offset >> 10);
137	+ buffer[2] = (tex->pitch << 22) \| ((tex->offset + dev_priv->fb_base) >> 10);
138	buffer[3] = 0xffffffff;
139	buffer[4] = 0xffffffff;
140	buffer[5] = (image->y << 16) \| image->x;
141	diff -Naur --exclude '.orig' --exclude '.rej' linux-2.6.1-gentoo/drivers/char/omnibook/Makefile linux-2.6.1-gentoo-test/drivers/char/omnibook/Makefile
142	--- linux-2.6.1-gentoo/drivers/char/omnibook/Makefile 1970-01-01 01:00:00.000000000 +0100
143	+++ linux-2.6.1-gentoo-test/drivers/char/omnibook/Makefile 2004-01-09 22:33:10.000000000 +0000
144	@@ -0,0 +1,37 @@
145	+#
146	+# Makefile -- makefile for the HP OmniBook support module
147	+#
148	+# This program is free software; you can redistribute it and/or modify it
149	+# under the terms of the GNU General Public License as published by the
150	+# Free Software Foundation; either version 2, or (at your option) any
151	+# later version.
152	+#
153	+# This program is distributed in the hope that it will be useful, but
154	+# WITHOUT ANY WARRANTY; without even the implied warranty of
155	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
156	+# General Public License for more details.
157	+#
158