New NVIDIA and Radeon cards pci ids. Soon I will add support for these :-) Also a...

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index d0e584823ddc36d07a79a836e6ed3bebf22cc4c0..6b3bc39bc5593e36e219b8b6f7b64d8ab7d215fb 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -357,7 +357,7 @@ void accel_bmove(struct display *p, int sy, int sx, int dy, int dx,
        area.dx = dx * vc->vc_font.width;
        area.dy = dy * vc->vc_font.height;
        area.height = height * vc->vc_font.height;
-       area.width = width * vc->vc_font.height;
+       area.width = width * vc->vc_font.width;
 
        info->fbops->fb_copyarea(info, &area);
 }
@@ -910,6 +910,12 @@ static void fbcon_set_display(int con, int init, int logo)
 
        info->var.xoffset = info->var.yoffset = p->yscroll = 0; /* reset wrap/pan */
 
+       /*
+        * FIXME: need to set this in order for KDFONTOP ioctl
+        *        to work
+        */
+       p->fontwidthmask = FONTWIDTHRANGE(1,16);
+
        for (i = 0; i < MAX_NR_CONSOLES; i++)
                if (i != con && fb_display[i].fb_info == info &&
                    fb_display[i].conp && fb_display[i].fontdata)
@@ -1986,12 +1992,8 @@ static int fbcon_blank(struct vc_data *vc, int blank)
                } else
                        update_screen(vc->vc_num);
                return 0;
-       } else {
-               /* Tell console.c that it has to restore the screen itself */
-               return 1;
-       }
-       fb_blank(blank, info);
-       return 0;
+       } else
+               return fb_blank(blank, info);
 }
 
 static void fbcon_free_font(struct display *p)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9f0ec735c051defa5837e9bcef437d50a6b692d2..7c0e1de47668fa5e5860d84bf794de5a30c71384 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -934,12 +934,28 @@
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2     0x0151
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA    0x0152
 #define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO       0x0153
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460   0x0170
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440   0x0171
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420   0x0172
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO   0x0174
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO   0x0175
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32 0x0176
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL    0x0178
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64 0x0179
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_200       0x017A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL    0x017B
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL  0x017C
 #define PCI_DEVICE_ID_NVIDIA_IGEFORCE2         0x01a0
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE                0x01bc
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE3          0x0200
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1                0x0201
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2                0x0202
 #define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC                0x0203
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600  0x0250
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400  0x0251
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200  0x0253
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL    0x0258
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL    0x0259
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL    0x025B
 
 #define PCI_VENDOR_ID_IMS              0x10e0
 #define PCI_DEVICE_ID_IMS_8849         0x8849