tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
+17
-18
+1
-1
drivers/char/agp/amd64-agp.c
+1
-1
drivers/char/agp/amd64-agp.c
···
429
429
struct pci_dev *dev1;
430
430
int i;
431
431
unsigned size = amd64_fetch_size();
432
-
printk(KERN_INFO "Setting up ULi AGP. \n");
432
+
printk(KERN_INFO "Setting up ULi AGP.\n");
433
433
dev1 = pci_find_slot ((unsigned int)pdev->bus->number,PCI_DEVFN(0,0));
434
434
if (dev1 == NULL) {
435
435
printk(KERN_INFO PFX "Detected a ULi chipset, "
+16
-17
drivers/char/agp/generic.c
+16
-17
drivers/char/agp/generic.c
···
319
319
info->mode = bridge->mode & ~AGP3_RESERVED_MASK;
320
320
else
321
321
info->mode = bridge->mode & ~AGP2_RESERVED_MASK;
322
-
info->mode = bridge->mode;
323
322
info->aper_base = bridge->gart_bus_addr;
324
323
info->aper_size = agp_return_size();
325
324
info->max_memory = bridge->max_memory_agp;
···
355
356
return -EINVAL;
356
357
357
358
if (curr->is_bound == TRUE) {
358
-
printk (KERN_INFO PFX "memory %p is already bound!\n", curr);
359
+
printk(KERN_INFO PFX "memory %p is already bound!\n", curr);
359
360
return -EINVAL;
360
361
}
361
362
if (curr->is_flushed == FALSE) {
···
390
391
return -EINVAL;
391
392
392
393
if (curr->is_bound != TRUE) {
393
-
printk (KERN_INFO PFX "memory %p was not bound!\n", curr);
394
+
printk(KERN_INFO PFX "memory %p was not bound!\n", curr);
394
395
return -EINVAL;
395
396
}
396
397
···
414
415
u32 tmp;
415
416
416
417
if (*requested_mode & AGP2_RESERVED_MASK) {
417
-
printk (KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
418
+
printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
418
419
*requested_mode &= ~AGP2_RESERVED_MASK;
419
420
}
420
421
···
422
423
tmp = *requested_mode & 7;
423
424
switch (tmp) {
424
425
case 0:
425
-
printk (KERN_INFO PFX "%s tried to set rate=x0. Setting to x1 mode.\n", current->comm);
426
+
printk(KERN_INFO PFX "%s tried to set rate=x0. Setting to x1 mode.\n", current->comm);
426
427
*requested_mode |= AGPSTAT2_1X;
427
428
break;
428
429
case 1:
···
492
493
u32 tmp;
493
494
494
495
if (*requested_mode & AGP3_RESERVED_MASK) {
495
-
printk (KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
496
+
printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
496
497
*requested_mode &= ~AGP3_RESERVED_MASK;
497
498
}
498
499
499
500
/* Check the speed bits make sense. */
500
501
tmp = *requested_mode & 7;
501
502
if (tmp == 0) {
502
-
printk (KERN_INFO PFX "%s tried to set rate=x0. Setting to AGP3 x4 mode.\n", current->comm);
503
+
printk(KERN_INFO PFX "%s tried to set rate=x0. Setting to AGP3 x4 mode.\n", current->comm);
503
504
*requested_mode |= AGPSTAT3_4X;
504
505
}
505
506
if (tmp >= 3) {
506
-
printk (KERN_INFO PFX "%s tried to set rate=x%d. Setting to AGP3 x8 mode.\n", current->comm, tmp * 4);
507
+
printk(KERN_INFO PFX "%s tried to set rate=x%d. Setting to AGP3 x8 mode.\n", current->comm, tmp * 4);
507
508
*requested_mode = (*requested_mode & ~7) | AGPSTAT3_8X;
508
509
}
509
510
···
532
533
* AGP2.x 4x -> AGP3.0 4x.
533
534
*/
534
535
if (*requested_mode & AGPSTAT2_4X) {
535
-
printk (KERN_INFO PFX "%s passes broken AGP3 flags (%x). Fixed.\n",
536
+
printk(KERN_INFO PFX "%s passes broken AGP3 flags (%x). Fixed.\n",
536
537
current->comm, *requested_mode);
537
538
*requested_mode &= ~AGPSTAT2_4X;
538
539
*requested_mode |= AGPSTAT3_4X;
···
543
544
* but have been passed an AGP 2.x mode.
544
545
* Convert AGP 1x,2x,4x -> AGP 3.0 4x.
545
546
*/
546
-
printk (KERN_INFO PFX "%s passes broken AGP2 flags (%x) in AGP3 mode. Fixed.\n",
547
+
printk(KERN_INFO PFX "%s passes broken AGP2 flags (%x) in AGP3 mode. Fixed.\n",
547
548
current->comm, *requested_mode);
548
549
*requested_mode &= ~(AGPSTAT2_4X | AGPSTAT2_2X | AGPSTAT2_1X);
549
550
*requested_mode |= AGPSTAT3_4X;
···
553
554
if (!(*bridge_agpstat & AGPSTAT3_8X)) {
554
555
*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
555
556
*bridge_agpstat |= AGPSTAT3_4X;
556
-
printk ("%s requested AGPx8 but bridge not capable.\n", current->comm);
557
+
printk(KERN_INFO PFX "%s requested AGPx8 but bridge not capable.\n", current->comm);
557
558
return;
558
559
}
559
560
if (!(*vga_agpstat & AGPSTAT3_8X)) {
560
561
*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
561
562
*bridge_agpstat |= AGPSTAT3_4X;
562
-
printk ("%s requested AGPx8 but graphic card not capable.\n", current->comm);
563
+
printk(KERN_INFO PFX "%s requested AGPx8 but graphic card not capable.\n", current->comm);
563
564
return;
564
565
}
565
566
/* All set, bridge & device can do AGP x8*/
···
577
578
if ((*bridge_agpstat & AGPSTAT3_4X) && (*vga_agpstat & AGPSTAT3_4X))
578
579
*bridge_agpstat |= AGPSTAT3_4X;
579
580
else {
580
-
printk (KERN_INFO PFX "Badness. Don't know which AGP mode to set. "
581
+
printk(KERN_INFO PFX "Badness. Don't know which AGP mode to set. "
581
582
"[bridge_agpstat:%x vga_agpstat:%x fell back to:- bridge_agpstat:%x vga_agpstat:%x]\n",
582
583
origbridge, origvga, *bridge_agpstat, *vga_agpstat);
583
584
if (!(*bridge_agpstat & AGPSTAT3_4X))
584
-
printk (KERN_INFO PFX "Bridge couldn't do AGP x4.\n");
585
+
printk(KERN_INFO PFX "Bridge couldn't do AGP x4.\n");
585
586
if (!(*vga_agpstat & AGPSTAT3_4X))
586
-
printk (KERN_INFO PFX "Graphic card couldn't do AGP x4.\n");
587
+
printk(KERN_INFO PFX "Graphic card couldn't do AGP x4.\n");
587
588
return;
588
589
}
589
590
}
···
621
622
for (;;) {
622
623
device = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, device);
623
624
if (!device) {
624
-
printk (KERN_INFO PFX "Couldn't find an AGP VGA controller.\n");
625
+
printk(KERN_INFO PFX "Couldn't find an AGP VGA controller.\n");
625
626
return 0;
626
627
}
627
628
cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
···
733
734
pci_write_config_dword(bridge->dev,
734
735
bridge->capndx+AGPCTRL, temp);
735
736
736
-
printk (KERN_INFO PFX "Device is in legacy mode,"
737
+
printk(KERN_INFO PFX "Device is in legacy mode,"
737
738
" falling back to 2.x\n");
738
739
}
739
740
}