OSDN Git Service

matroxfb: add Matrox MGA-G200eW board support
authorRich Felker <dalias@libc.org>
Sat, 25 Jan 2020 19:55:06 +0000 (14:55 -0500)
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Mon, 2 Mar 2020 15:32:13 +0000 (16:32 +0100)
It's needed to support the onboard video on my Spectre-free
Atom S1260 server board.

Signed-off-by: Rich Felker <dalias@libc.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
[b.zolnierkie: patch description fixup]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200125195506.GA16638@brightrain.aerifal.cx
drivers/video/fbdev/matrox/matroxfb_base.c

index 36cc718..570439b 100644 (file)
@@ -1376,6 +1376,12 @@ static struct video_board vbG200 = {
        .accelID = FB_ACCEL_MATROX_MGAG200,
        .lowlevel = &matrox_G100
 };
+static struct video_board vbG200eW = {
+       .maxvram = 0x800000,
+       .maxdisplayable = 0x800000,
+       .accelID = FB_ACCEL_MATROX_MGAG200,
+       .lowlevel = &matrox_G100
+};
 /* from doc it looks like that accelerator can draw only to low 16MB :-( Direct accesses & displaying are OK for
    whole 32MB */
 static struct video_board vbG400 = {
@@ -1494,6 +1500,13 @@ static struct board {
                MGA_G200,
                &vbG200,
                "MGA-G200 (PCI)"},
+       {PCI_VENDOR_ID_MATROX,  0x0532, 0xFF,
+               0,                      0,
+               DEVF_G200,
+               250000,
+               MGA_G200,
+               &vbG200eW,
+               "MGA-G200eW (PCI)"},
        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_AGP,  0xFF,
                PCI_SS_VENDOR_ID_MATROX,        PCI_SS_ID_MATROX_GENERIC,
                DEVF_G200,
@@ -2136,6 +2149,8 @@ static const struct pci_device_id matroxfb_devices[] = {
                PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_PCI,
                PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
+       {PCI_VENDOR_ID_MATROX,  0x0532,
+               PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_AGP,
                PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G400,