Re: [Fwd: Re: OOPS in agpgart (2.4.13, 2.4.15pre7)]

[Stephan von Krawczynski <skraw@ithnet.com>]

On Tue, 27 Nov 2001 11:48:35 +0100
Didier Moens <Didier.Moens@dmb.rug.ac.be> wrote:

> 2. compared to Stephan's original patches ("if i830m_dev ..." and 
> "break;") :
> 
> Nov 27 11:37:07 localhost kernel: Linux agpgart interface v0.99 (c) Jeff 
> Hartmann
> Nov 27 11:37:07 localhost kernel: agpgart: Maximum main memory to use 
> for agp memory: 439M
> Nov 27 11:37:07 localhost kernel: agpgart: Detected Intel i830M chipset
> Nov 27 11:37:07 localhost kernel: agpgart: AGP aperture is 256M @ 0xd0000000
> 
> [root@localhost agp]# /home/didier/repository/kernel/testgart
> version: 0.99
> bridge id: 0x35758086
> agp_mode: 0x1f000217
> aper_base: 0xd0000000
> aper_size: 256
> pg_total: 112384
> pg_system: 112384
> pg_used: 0
> entry.key : 0
> entry.key : 1
> Allocated 8 megs of GART memory
> MemoryBenchmark: 859 mb/s
> MemoryBenchmark: 887 mb/s
> MemoryBenchmark: 876 mb/s
> Average speed: 874 mb/s
> Testing data integrity (1st pass): passed on first pass.
> Testing data integrity (2nd pass): passed on second pass.

Ok, since performance and detection seems just ok, I would suggest the attached
patch as a fix. Unlike Nicolas I don't see a need for an additional i830MP
patch, its only the correct detection of the different i830 setups that needs
to be done IMHO.
If there are no further complaints we should submit the patch. What do you
think Nicolas?

Regards,
Stephan


--- agpgart_be.c-orig   Tue Nov 27 12:07:14 2001
+++ agpgart_be.c        Tue Nov 27 12:07:02 2001
@@ -3879,6 +3879,10 @@
                        i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
                                                                          
PCI_DEVICE_ID_INTEL_830_M_1,
                                                                          
NULL);
+                       /* If we cannot find secondary, we probably have i830MP
+                          which is detected later on */
+                       if (i810_dev == NULL) 
+                               break;
                        if(PCI_FUNC(i810_dev->devfn) != 0) {
                                i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
                                                                               
  PCI_DEVICE_ID_INTEL_830_M_1,