Commit 4f052b71 authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGP] Add debug info to failure path of AGP 3.0 rate enabling

parent cdb2915d
...@@ -50,8 +50,6 @@ static int x86_64_insert_memory(agp_memory * mem, off_t pg_start, int type) ...@@ -50,8 +50,6 @@ static int x86_64_insert_memory(agp_memory * mem, off_t pg_start, int type)
u32 pte; u32 pte;
u64 addr; u64 addr;
temp = agp_bridge.current_size;
num_entries = agp_num_entries(); num_entries = agp_num_entries();
if (type != 0 || mem->type != 0) if (type != 0 || mem->type != 0)
......
...@@ -393,8 +393,7 @@ static int agp_3_0_node_enable(u32 mode, u32 minor) ...@@ -393,8 +393,7 @@ static int agp_3_0_node_enable(u32 mode, u32 minor)
if(mcapndx == 0) { if(mcapndx == 0) {
printk(KERN_ERR PFX "woah! Non-AGP device " printk(KERN_ERR PFX "woah! Non-AGP device "
"found on the secondary bus of an AGP 3.0 " "found on the secondary bus of an AGP 3.0 bridge!\n");
"bridge!\n");
ret = -ENODEV; ret = -ENODEV;
goto free_and_exit; goto free_and_exit;
} }
...@@ -442,9 +441,8 @@ static int agp_3_0_node_enable(u32 mode, u32 minor) ...@@ -442,9 +441,8 @@ static int agp_3_0_node_enable(u32 mode, u32 minor)
rate = 0x2; rate = 0x2;
break; break;
default: default:
printk(KERN_ERR PFX "woah! Bogus AGP rate " printk(KERN_ERR PFX "woah! Bogus AGP rate (%d) "
"value found advertised behind an AGP 3.0 " "value found advertised behind an AGP 3.0 bridge!\n", rate);
"bridge!\n");
ret = -ENODEV; ret = -ENODEV;
goto free_and_exit; goto free_and_exit;
} }
...@@ -455,12 +453,10 @@ static int agp_3_0_node_enable(u32 mode, u32 minor) ...@@ -455,12 +453,10 @@ static int agp_3_0_node_enable(u32 mode, u32 minor)
* whether isochronous transfers are supported. * whether isochronous transfers are supported.
*/ */
if(isoch != 0) { if(isoch != 0) {
if((ret = agp_3_0_isochronous_node_enable(dev_list, if((ret = agp_3_0_isochronous_node_enable(dev_list, ndevs)) != 0)
ndevs)) != 0)
goto free_and_exit; goto free_and_exit;
} else { } else {
if((ret = agp_3_0_nonisochronous_node_enable(dev_list, if((ret = agp_3_0_nonisochronous_node_enable(dev_list,ndevs)) != 0)
ndevs)) != 0)
goto free_and_exit; goto free_and_exit;
} }
...@@ -534,8 +530,7 @@ int agp_generic_agp_3_0_enable(u32 mode) ...@@ -534,8 +530,7 @@ int agp_generic_agp_3_0_enable(u32 mode)
major = (ncapid >> 20) & 0xf; major = (ncapid >> 20) & 0xf;
minor = (ncapid >> 16) & 0xf; minor = (ncapid >> 16) & 0xf;
printk(KERN_INFO PFX "Found an AGP %d.%d compliant device.\n", printk(KERN_INFO PFX "Found an AGP %d.%d compliant device.\n",major, minor);
major, minor);
if(major >= 3) { if(major >= 3) {
pci_read_config_dword(agp_bridge.dev, agp_bridge.capndx + 0x4, &agp_3_0); pci_read_config_dword(agp_bridge.dev, agp_bridge.capndx + 0x4, &agp_3_0);
......
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