diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-10 17:45:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-10 17:45:34 +1000 |
| commit | 93f453f3ffd8f4dbb0311b58b854e7655da3d601 (patch) | |
| tree | ce4be3b521fd73bf077bc447b5ef799fbdd15263 /drivers | |
| parent | cda173806644d2af22ffd9896eed8ef99b97d356 (diff) | |
| download | op-kernel-dev-93f453f3ffd8f4dbb0311b58b854e7655da3d601.zip op-kernel-dev-93f453f3ffd8f4dbb0311b58b854e7655da3d601.tar.gz | |
drm: add new mga ids and types
From: Ian Romanick <idr@us.ibm.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/drm/drm_pciids.h | 7 | ||||
| -rw-r--r-- | drivers/char/drm/mga_drm.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h index 70ca4fa..4f317ec 100644 --- a/drivers/char/drm/drm_pciids.h +++ b/drivers/char/drm/drm_pciids.h @@ -116,9 +116,10 @@ {0, 0, 0} #define mga_PCI_IDS \ - {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ + {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ + {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ + {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \ + {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \ {0, 0, 0} #define mach64_PCI_IDS \ diff --git a/drivers/char/drm/mga_drm.h b/drivers/char/drm/mga_drm.h index 521d445..4500e6e 100644 --- a/drivers/char/drm/mga_drm.h +++ b/drivers/char/drm/mga_drm.h @@ -73,7 +73,8 @@ #define MGA_CARD_TYPE_G200 1 #define MGA_CARD_TYPE_G400 2 - +#define MGA_CARD_TYPE_G450 3 /* not currently used */ +#define MGA_CARD_TYPE_G550 4 #define MGA_FRONT 0x1 #define MGA_BACK 0x2 |
