[parisc-linux-cvs] linux deller
Helge Deller
deller@gmx.de
Mon, 22 Apr 2002 02:08:23 +0200
--------------Boundary-00=_ZD0YY1G3H84FRHVO7BX5
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
On Monday 22 April 2002 02:04, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux
> Changes by: deller 02/04/21 18:04:10
>
> Modified files:
> . : Makefile
> arch/parisc/kernel: power.c
> drivers/video/sti: sticore.c stifb.c
>
> Log message:
> 2.4.18-pa21:
> - fixed small bug in soft-power-switch code for non-procfs builds,
> - cleaned up kernel messages of STI driver, added version number,
> - fixed small compiler warning in stifb.c (HCRX_SETUP_RAMDAC and
> setNgleLutBltCtl aren't used yet).
--------------Boundary-00=_ZD0YY1G3H84FRHVO7BX5
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.291
diff -u -p -r1.291 Makefile
--- Makefile 2002/04/16 00:06:03 1.291
+++ Makefile 2002/04/22 00:00:49
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 18
-EXTRAVERSION = -pa20
+EXTRAVERSION = -pa21
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: arch/parisc/kernel/power.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/power.c,v
retrieving revision 1.7
diff -u -p -r1.7 power.c
--- arch/parisc/kernel/power.c 2002/04/15 23:40:15 1.7
+++ arch/parisc/kernel/power.c 2002/04/22 00:00:50
@@ -117,7 +117,7 @@ static void process_shutdown(void)
#ifdef CONFIG_PROC_FS
static int pwrsw_enabled = 1;
#else
-#define pwrsw_enabled (0)
+#define pwrsw_enabled (1)
#endif
/* soft power switch function ptr */
Index: drivers/video/sti/sticore.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/sticore.c,v
retrieving revision 1.38
diff -u -p -r1.38 sticore.c
--- drivers/video/sti/sticore.c 2002/03/25 22:11:40 1.38
+++ drivers/video/sti/sticore.c 2002/04/22 00:00:52
@@ -28,6 +28,8 @@
#include "sticore.h"
+#define STI_DRIVERVERSION "0.9"
+
struct sti_struct *default_sti;
static int num_sti_roms; /* # of STI ROMS found */
@@ -552,8 +554,7 @@ sti_select_font(struct sti_cooked_rom *r
static void __init
sti_dump_rom(struct sti_rom *rom)
{
- printk(KERN_INFO "STI %s mode ROM, id %04x-%04x, conforms to spec rev. %d.%02x\n",
- (rom->type[3] == 1) ? "byte" : "word",
+ printk(KERN_INFO "STI id %04x-%04x, conforms to spec rev. %d.%02x\n",
rom->graphics_id[0],
rom->graphics_id[1],
rom->revno[0] >> 4,
@@ -802,8 +803,7 @@ test_rom:
/* The ROM could have multiple architecture
* dependent images (e.g. i386, parisc,...) */
printk(KERN_WARNING
- "%s: PCI ROM is not a STI ROM type image (0x%8x)\n",
- __FILE__, i);
+ "PCI ROM is not a STI ROM type image (0x%8x)\n", i);
goto out_err;
}
@@ -835,13 +835,13 @@ test_rom:
ok = 0;
if ((sig & 0xff) == 0x01) {
- printk(KERN_INFO "STI byte mode ROM at %08lx, hpa=%08lx\n",
+ printk(KERN_INFO "STI byte mode ROM at %08lx, hpa at %08lx\n",
address, hpa);
ok = sti_read_rom(0, sti, address);
}
if ((sig & 0xffff) == 0x0303) {
- printk(KERN_INFO "STI word mode ROM at %08lx, hpa=%08lx\n",
+ printk(KERN_INFO "STI word mode ROM at %08lx, hpa at %08lx\n",
address, hpa);
ok = sti_read_rom(1, sti, address);
}
@@ -859,7 +859,7 @@ test_rom:
unsigned long rom_base;
rom_base = pci_resource_start(sti->pd, PCI_ROM_RESOURCE);
pci_write_config_dword(sti->pd, PCI_ROM_ADDRESS, rom_base & ~PCI_ROM_ADDRESS_ENABLE);
- printk(KERN_DEBUG "STI PCI ROM disabled\n");
+ DPRINTK((KERN_DEBUG "STI PCI ROM disabled\n"));
}
if (sti_init_graph(sti))
@@ -927,7 +927,6 @@ static int __devinit sticore_pci_init(st
unsigned long fb_base, rom_base;
unsigned int fb_len, rom_len;
struct sti_struct *sti;
- int i;
pci_enable_device(pd);
@@ -937,21 +936,15 @@ static int __devinit sticore_pci_init(st
rom_len = pci_resource_len(pd, PCI_ROM_RESOURCE);
if (rom_base) {
pci_write_config_dword(pd, PCI_ROM_ADDRESS, rom_base | PCI_ROM_ADDRESS_ENABLE);
- printk(KERN_DEBUG "STI PCI ROM enabled at 0x%08lx\n", rom_base);
+ DPRINTK((KERN_DEBUG "STI PCI ROM enabled at 0x%08lx\n", rom_base));
}
- printk(KERN_INFO "PCI graphic ROM found at %08lx (%u kB), fb @ %08lx (%u MB)\n",
+ printk(KERN_INFO "STI PCI graphic ROM found at %08lx (%u kB), fb at %08lx (%u MB)\n",
rom_base, rom_len/1024, fb_base, fb_len/1024/1024);
- for (i=0; i<DEVICE_COUNT_RESOURCE; i++)
- printk(KERN_DEBUG "PCI region %d: %08lx with %lu kB\n",
- i,
- pci_resource_start(pd,i),
- pci_resource_len(pd,i)/1024);
+ DPRINTK((KERN_DEBUG "Trying PCI STI ROM at %08lx, PCI hpa at %08lx\n",
+ rom_base, fb_base));
- printk(KERN_DEBUG "Trying PCI STI ROM at %08lx, PCI hpa at %08lx\n",
- rom_base, fb_base);
-
sti = sti_try_rom_generic(rom_base, fb_base, pd);
if (sti) {
char pa_path[30];
@@ -1013,6 +1006,9 @@ struct sti_struct * __init sti_init_roms
if (initialized)
goto out;
+
+ printk(KERN_INFO "STI GSC/PCI graphics driver version %s\n",
+ STI_DRIVERVERSION);
/* Register drivers for native & PCI cards */
register_parisc_driver(&pa_sti_driver);
Index: drivers/video/sti/stifb.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/stifb.c,v
retrieving revision 1.30
diff -u -p -r1.30 stifb.c
--- drivers/video/sti/stifb.c 2002/03/30 20:33:43 1.30
+++ drivers/video/sti/stifb.c 2002/04/22 00:00:54
@@ -285,11 +285,13 @@ CRX24_SETUP_RAMDAC(struct stifb_info *fb
WRITE_WORD(0x03000000, fb, 0x1008);
}
+#if 0
static void
HCRX_SETUP_RAMDAC(struct stifb_info *fb)
{
WRITE_WORD(0xffffffff, fb, REG_32);
}
+#endif
static void
CRX24_SET_OVLY_MASK(struct stifb_info *fb)
@@ -536,6 +538,7 @@ typedef union /* Note assumption that fi
} NgleLutBltCtl;
+#if 0
static NgleLutBltCtl
setNgleLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)
{
@@ -573,7 +576,7 @@ setNgleLutBltCtl(struct stifb_info *fb,
return lutBltCtl;
}
-
+#endif
static NgleLutBltCtl
setHyperLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)
--------------Boundary-00=_ZD0YY1G3H84FRHVO7BX5--