Ticket #5872: nvidia02e2.diff

kernel/drivers/graphics/nvidia/driver.c

@@ -265 +265 @@
     0x02a0, /* Nvidia GeForce3 Integrated GPU */
     0x02e0, /* Nvidia GeForce 7600 GT */
     0x02e1, /* Nvidia GeForce 7600 GS */
+    0x02e2, /* Nvidia GeForce 7300 GT */
     0x0301, /* Nvidia GeForce FX 5800 Ultra */
     0x0302, /* Nvidia GeForce FX 5800 */
     0x0308, /* Nvidia Quadro FX 2000 */
@@ -527 +528 @@
     int registers = 0;
     int frame_buffer = 1;
 
+    /* syslog */
+    dprintf(DRIVER_PREFIX ": map device\n");
+
     /* enable memory mapped IO, disable VGA I/O - this is defined in the PCI standard */
     tmpUlong = get_pci(PCI_command, 2);
     /* enable PCI access */
@@ -778 +782 @@
     pd->count = count;
     /* terminate list of device names with a null pointer */
     pd->device_names[pd->count] = NULL;
+    /* syslog */
+    dprintf(DRIVER_PREFIX ": %d devices found\n", count);
 }
 
 
@@ -1162 +1168 @@
         /* the only PUBLIC ioctl */
         case B_GET_ACCELERANT_SIGNATURE:
         {
+            dprintf(DRIVER_PREFIX ": acc: %s\n", sSettings.accelerant); /* syslog */
             strcpy((char* )buf, sSettings.accelerant);
             result = B_OK;
             break;
@@ -1401 +1408 @@
         char *end;
         uint32 value;
 
+        /* syslog */
+        dprintf(DRIVER_PREFIX ": settings loaded\n");
+
         // for driver
         item = get_driver_parameter(settings, "accelerant", "", "");
         if (item[0] && strlen(item) < sizeof(sSettings.accelerant) - 1)
@@ -1465 +1475 @@
 
         unload_driver_settings(settings);
     }
+    else dprintf(DRIVER_PREFIX ": default settings\n"); /* syslog */
 
     /* get a handle for the pci bus */
     if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci_bus) != B_OK)

accelerants/nvidia/engine/nv_general.c

@@ -947 +947 @@
         sprintf(si->adi.chipset, "G73");
         status = nvxx_general_powerup();
         break;
+    case 0x02e210de: /* Nvidia GeForce 7300 GT */
+        si->ps.card_type = G73;
+        si->ps.card_arch = NV40A;
+        sprintf(si->adi.name, "Nvidia GeForce 7300 GT");
+        sprintf(si->adi.chipset, "G73");
+        status = nvxx_general_powerup();
+        break;
     case 0x030110de: /* Nvidia GeForce FX 5800 Ultra */
     case 0x030210de: /* Nvidia GeForce FX 5800 */
         si->ps.card_type = NV30;