d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix breakage of CHIP_I855 in the last revision.

Browse Source 
Submitted by:	Ted Faber <faber@ISI.EDU>
This commit is contained in:
Eric Anholt 2006-06-27 14:05:11 +00:00
parent 904887e254
commit 806baa6401
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/agp/agp_i810.c
View File

@ -113,9 +113,9 @@ static const struct agp_i810_match {
"Intel 82815 (i815 GMCH) SVGA controller"},
{0x35778086, CHIP_I830, 0x00020000,
"Intel 82830M (830M GMCH) SVGA controller"},
{0x35828086, CHIP_I830, 0x00020000,
{0x35828086, CHIP_I855, 0x00020000,
"Intel 82852/5"},
{0x25728086, CHIP_I830, 0x00020000,
{0x25728086, CHIP_I855, 0x00020000,
"Intel 82865G (865G GMCH) SVGA controller"},
{0x25828086, CHIP_I915, 0x00020000,
"Intel 82915G (915G GMCH) SVGA controller"},
@ -224,7 +224,8 @@ agp_i810_probe(device_t dev)
printf("I810: disabled, not probing\n");
return ENXIO;
}
} else if (match->chiptype == CHIP_I830) {
} else if (match->chiptype == CHIP_I830 ||
match->chiptype == CHIP_I855) {
unsigned int gcc1;
gcc1 = pci_read_config(bdev, AGP_I830_GCC1, 1);

7
sys/pci/agp_i810.c
View File

@ -113,9 +113,9 @@ static const struct agp_i810_match {
"Intel 82815 (i815 GMCH) SVGA controller"},
{0x35778086, CHIP_I830, 0x00020000,
"Intel 82830M (830M GMCH) SVGA controller"},
{0x35828086, CHIP_I830, 0x00020000,
{0x35828086, CHIP_I855, 0x00020000,
"Intel 82852/5"},
{0x25728086, CHIP_I830, 0x00020000,
{0x25728086, CHIP_I855, 0x00020000,
"Intel 82865G (865G GMCH) SVGA controller"},
{0x25828086, CHIP_I915, 0x00020000,
"Intel 82915G (915G GMCH) SVGA controller"},
@ -224,7 +224,8 @@ agp_i810_probe(device_t dev)
printf("I810: disabled, not probing\n");
return ENXIO;
}
} else if (match->chiptype == CHIP_I830) {
} else if (match->chiptype == CHIP_I830 ||
match->chiptype == CHIP_I855) {
unsigned int gcc1;
gcc1 = pci_read_config(bdev, AGP_I830_GCC1, 1);