Commit b4e695c7 authored by Dave Jones's avatar Dave Jones

Merge halogen.(none):/home/davej/src/kernel/2.5/bk-linus

into halogen.(none):/home/davej/src/kernel/2.5/agpgart
parents c2e2d4f7 d30f2db2
...@@ -278,12 +278,13 @@ static int __init agp_amdk8_probe(struct pci_dev *pdev, ...@@ -278,12 +278,13 @@ static int __init agp_amdk8_probe(struct pci_dev *pdev,
default: revstring="??"; default: revstring="??";
break; break;
} }
printk ("Detected AMD 8151 AGP Bridge rev %s", revstring); printk (KERN_INFO PFX "Detected AMD 8151 AGP Bridge rev %s\n", revstring);
/* /*
* Work around errata. * Work around errata.
* Chips before B2 stepping incorrectly reporting v3.5 * Chips before B2 stepping incorrectly reporting v3.5
*/ */
if (rev_id < 0x13) { if (rev_id < 0x13) {
printk (KERN_INFO PFX "Correcting AGP revision (reports 3.5, is really 3.0)\n");
bridge->major_version = 3; bridge->major_version = 3;
bridge->minor_version = 0; bridge->minor_version = 0;
} }
......
...@@ -300,7 +300,6 @@ static struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type) ...@@ -300,7 +300,6 @@ static struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type)
struct agp_memory *memory; struct agp_memory *memory;
memory = agp_allocate_memory(pg_count, type); memory = agp_allocate_memory(pg_count, type);
printk(KERN_DEBUG "agp_allocate_memory: %p\n", memory);
if (memory == NULL) if (memory == NULL)
return NULL; return NULL;
......
...@@ -447,7 +447,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start, ...@@ -447,7 +447,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start,
printk (KERN_DEBUG "pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x\n", printk (KERN_DEBUG "pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x\n",
pg_start,intel_i830_private.gtt_entries); pg_start,intel_i830_private.gtt_entries);
printk ("Trying to insert into local/stolen memory\n"); printk (KERN_INFO PFX "Trying to insert into local/stolen memory\n");
return (-EINVAL); return (-EINVAL);
} }
...@@ -483,7 +483,7 @@ static int intel_i830_remove_entries(struct agp_memory *mem,off_t pg_start, ...@@ -483,7 +483,7 @@ static int intel_i830_remove_entries(struct agp_memory *mem,off_t pg_start,
global_cache_flush(); global_cache_flush();
if (pg_start < intel_i830_private.gtt_entries) { if (pg_start < intel_i830_private.gtt_entries) {
printk ("Trying to disable local/stolen memory\n"); printk (KERN_INFO PFX "Trying to disable local/stolen memory\n");
return (-EINVAL); return (-EINVAL);
} }
...@@ -645,7 +645,7 @@ static int intel_815_configure(void) ...@@ -645,7 +645,7 @@ static int intel_815_configure(void)
/* the Intel 815 chipset spec. says that bits 29-31 in the /* the Intel 815 chipset spec. says that bits 29-31 in the
* ATTBASE register are reserved -> try not to write them */ * ATTBASE register are reserved -> try not to write them */
if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) { if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) {
printk (KERN_EMERG "gatt bus addr too high"); printk (KERN_EMERG PFX "gatt bus addr too high");
return -EINVAL; return -EINVAL;
} }
......
...@@ -240,7 +240,7 @@ static void serverworks_tlbflush(struct agp_memory *temp) ...@@ -240,7 +240,7 @@ static void serverworks_tlbflush(struct agp_memory *temp)
while(INREG8(serverworks_private.registers, while(INREG8(serverworks_private.registers,
SVWRKS_POSTFLUSH) == 0x01) { SVWRKS_POSTFLUSH) == 0x01) {
if((signed)(end - jiffies) <= 0) { if((signed)(end - jiffies) <= 0) {
printk(KERN_ERR "Posted write buffer flush took more" printk(KERN_ERR PFX "Posted write buffer flush took more"
"then 3 seconds\n"); "then 3 seconds\n");
} }
} }
...@@ -249,7 +249,7 @@ static void serverworks_tlbflush(struct agp_memory *temp) ...@@ -249,7 +249,7 @@ static void serverworks_tlbflush(struct agp_memory *temp)
while(INREG32(serverworks_private.registers, while(INREG32(serverworks_private.registers,
SVWRKS_DIRFLUSH) == 0x00000001) { SVWRKS_DIRFLUSH) == 0x00000001) {
if((signed)(end - jiffies) <= 0) { if((signed)(end - jiffies) <= 0) {
printk(KERN_ERR "TLB flush took more" printk(KERN_ERR PFX "TLB flush took more"
"then 3 seconds\n"); "then 3 seconds\n");
} }
} }
...@@ -447,8 +447,7 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev, ...@@ -447,8 +447,7 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
PCI_DEVFN(0, 1)); PCI_DEVFN(0, 1));
if (!bridge_dev) { if (!bridge_dev) {
printk(KERN_INFO PFX "agpgart: Detected a Serverworks " printk(KERN_INFO PFX "agpgart: Detected a Serverworks "
"Chipset, but could not find the secondary " "Chipset, but could not find the secondary device.\n");
"device.\n");
return -ENODEV; return -ENODEV;
} }
...@@ -470,8 +469,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev, ...@@ -470,8 +469,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
if (temp & PCI_BASE_ADDRESS_MEM_TYPE_64) { if (temp & PCI_BASE_ADDRESS_MEM_TYPE_64) {
pci_read_config_dword(pdev, SVWRKS_APSIZE + 4, &temp2); pci_read_config_dword(pdev, SVWRKS_APSIZE + 4, &temp2);
if (temp2 != 0) { if (temp2 != 0) {
printk("Detected 64 bit aperture address, but top " printk(KERN_INFO PFX "Detected 64 bit aperture address, "
"bits are not zero. Disabling agp\n"); "but top bits are not zero. Disabling agp\n");
return -ENODEV; return -ENODEV;
} }
serverworks_private.mm_addr_ofs = 0x18; serverworks_private.mm_addr_ofs = 0x18;
...@@ -483,8 +482,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev, ...@@ -483,8 +482,8 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
pci_read_config_dword(pdev, pci_read_config_dword(pdev,
serverworks_private.mm_addr_ofs + 4, &temp2); serverworks_private.mm_addr_ofs + 4, &temp2);
if (temp2 != 0) { if (temp2 != 0) {
printk("Detected 64 bit MMIO address, but top " printk(KERN_INFO PFX "Detected 64 bit MMIO address, "
"bits are not zero. Disabling agp\n"); "but top bits are not zero. Disabling agp\n");
return -ENODEV; return -ENODEV;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment