diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-05-23 23:34:07 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-05-25 14:52:47 -0700 |
| commit | 3d9631b819c5c6f64ebf9bda8aab93e1cc7f391f (patch) | |
| tree | 8cbe2801961d417b085a734e98f735e830b39c3c /src/mga.h | |
| parent | 0af7dba78559ce82b4c3eed0862415efcde51863 (diff) | |
Move PCI vendor/device id defines into mga.h instead of using xf86PciInfo.h
Silences deprecation warnings from xf86PciInfo.h in current Xorg servers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mga.h')
| -rw-r--r-- | src/mga.h | 45 |
1 files changed, 23 insertions, 22 deletions
@@ -116,29 +116,30 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*); #define OUTREG(addr,val) MGAdbg_outreg32(pScrn, addr, val, __FUNCTION__) #endif /* EXTRADEBUG */ -#ifndef PCI_CHIP_MGAG200_SE_A_PCI -#define PCI_CHIP_MGAG200_SE_A_PCI 0x0522 -#endif - -#ifndef PCI_CHIP_MGAG200_SE_B_PCI -#define PCI_CHIP_MGAG200_SE_B_PCI 0x0524 -#endif - -#ifndef PCI_CHIP_MGAG200_WINBOND_PCI -#define PCI_CHIP_MGAG200_WINBOND_PCI 0x0532 -#endif - -#ifndef PCI_CHIP_MGAG200_EV_PCI -#define PCI_CHIP_MGAG200_EV_PCI 0x0530 -#endif - -#ifndef PCI_CHIP_MGAG200_EH_PCI -#define PCI_CHIP_MGAG200_EH_PCI 0x0533 -#endif +/* + * PCI vendor/device ids, formerly in xf86PciInfo.h + */ -#ifndef PCI_CHIP_MGAG200_ER_PCI -#define PCI_CHIP_MGAG200_ER_PCI 0x0534 -#endif +#define PCI_VENDOR_MATROX 0x102B + +#define PCI_CHIP_MGA2085 0x0518 +#define PCI_CHIP_MGA2064 0x0519 +#define PCI_CHIP_MGA1064 0x051A +#define PCI_CHIP_MGA2164 0x051B +#define PCI_CHIP_MGA2164_AGP 0x051F + +#define PCI_CHIP_MGAG100_PCI 0x1000 +#define PCI_CHIP_MGAG100 0x1001 +#define PCI_CHIP_MGAG200_PCI 0x0520 +#define PCI_CHIP_MGAG200 0x0521 +#define PCI_CHIP_MGAG200_SE_A_PCI 0x0522 +#define PCI_CHIP_MGAG200_SE_B_PCI 0x0524 +#define PCI_CHIP_MGAG200_WINBOND_PCI 0x0532 +#define PCI_CHIP_MGAG200_EV_PCI 0x0530 +#define PCI_CHIP_MGAG200_EH_PCI 0x0533 +#define PCI_CHIP_MGAG200_ER_PCI 0x0534 +#define PCI_CHIP_MGAG400 0x0525 +#define PCI_CHIP_MGAG550 0x2527 /* * Read/write to the DAC via MMIO |