summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Bennett <sb476@cam.ac.uk>2008-08-18 15:15:43 +0100
committerStuart Bennett <sb476@cam.ac.uk>2008-08-18 15:15:43 +0100
commitca77362a62fe6eb72fd505b2d4355a049e4ace14 (patch)
treebcd00704a1a3d9b119a925a9b9915fee1d2d02ae
parentbb0161704d8be60ab2591dd57dffd6e0b6d3025f (diff)
Try to reduce problems encountered with nVidia chipsets
-rw-r--r--radeontool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/radeontool.c b/radeontool.c
index 5f2bcb2..aba5918 100644
--- a/radeontool.c
+++ b/radeontool.c
@@ -474,14 +474,14 @@ We need to look through it to find the smaller region base address f8fffc00.
if(fgets(line,sizeof(line),fp) == NULL) { /* if end of file */
fatal("Radeon hardware not found in lspci output.\n");
}
- if(strstr(line,"nVidia") || strstr(line,"nVidia Corp")) { /* if line contains a "radeon" string */
+ if(strstr(line,"VGA compatible controller") && strstr(line,"nVidia")) { /* if line contains a "radeon" string */
if(skip-- < 1) {
break;
}
}
};
- if(debug)
- printf("%s",line);
+// if(debug)
+ printf("%s\n",line);
while(1) { /* for every line up till memory statement */
if(fgets(line,sizeof(line),fp) == NULL || line[0] != '\t') { /* if end of file */
fatal("Radeon control memory not found.\n");
@@ -496,7 +496,7 @@ We need to look through it to find the smaller region base address f8fffc00.
fatal("parse error of lspci output (control memory not found)\n");
}
if(debug)
- printf("Radeon found. Base control address is %x.\n",base);
+ printf("nVidia card found. Base control address is %x.\n",base);
radeon_cntl_mem = map_devince_memory(base,0x800000);
}