From 3d9631b819c5c6f64ebf9bda8aab93e1cc7f391f Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 23 May 2012 23:34:07 -0700 Subject: 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 Reviewed-by: Dave Airlie --- src/mga.h | 45 +++++++++++++++++++++++---------------------- src/mga_bios.c | 3 --- src/mga_dac3026.c | 3 --- src/mga_dacG.c | 3 --- src/mga_dga.c | 1 - src/mga_dh.c | 3 --- src/mga_dri.c | 1 - src/mga_driver.c | 3 --- src/mga_exa.c | 1 - src/mga_g450pll.c | 3 --- src/mga_hwcurs.c | 1 - src/mga_merge.c | 2 -- src/mga_shadow.c | 1 - src/mga_storm.c | 3 --- src/mga_video.c | 1 - 15 files changed, 23 insertions(+), 51 deletions(-) diff --git a/src/mga.h b/src/mga.h index 77406f1..7d94d59 100644 --- a/src/mga.h +++ b/src/mga.h @@ -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 diff --git a/src/mga_bios.c b/src/mga_bios.c index b533dd1..a391b2c 100644 --- a/src/mga_bios.c +++ b/src/mga_bios.c @@ -46,9 +46,6 @@ #include "compiler.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c index 35bd9a3..97c2c7a 100644 --- a/src/mga_dac3026.c +++ b/src/mga_dac3026.c @@ -42,9 +42,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" diff --git a/src/mga_dacG.c b/src/mga_dacG.c index b489dea..ea598be 100644 --- a/src/mga_dacG.c +++ b/src/mga_dacG.c @@ -12,9 +12,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" diff --git a/src/mga_dga.c b/src/mga_dga.c index 224e4ba..6c26e44 100644 --- a/src/mga_dga.c +++ b/src/mga_dga.c @@ -5,7 +5,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xaa.h" #include "xaalocal.h" #include "mga.h" diff --git a/src/mga_dh.c b/src/mga_dh.c index d9c0d34..2b597b5 100644 --- a/src/mga_dh.c +++ b/src/mga_dh.c @@ -12,9 +12,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" diff --git a/src/mga_dri.c b/src/mga_dri.c index 1454994..4156bb5 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -33,7 +33,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "miline.h" diff --git a/src/mga_driver.c b/src/mga_driver.c index 61eb96c..806692a 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -65,9 +65,6 @@ #include "compiler.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that need to access the PCI config space directly need this */ #ifndef XSERVER_LIBPCIACCESS #include "xf86Pci.h" diff --git a/src/mga_exa.c b/src/mga_exa.c index ced6452..6cb4ae6 100644 --- a/src/mga_exa.c +++ b/src/mga_exa.c @@ -45,7 +45,6 @@ #include "mga_dri.h" #endif -#include "xf86PciInfo.h" #if 0 #define DEBUG_MSG(x) ErrorF x diff --git a/src/mga_g450pll.c b/src/mga_g450pll.c index 9f544b1..293178c 100644 --- a/src/mga_g450pll.c +++ b/src/mga_g450pll.c @@ -6,9 +6,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" diff --git a/src/mga_hwcurs.c b/src/mga_hwcurs.c index 9c8d01a..937f979 100644 --- a/src/mga_hwcurs.c +++ b/src/mga_hwcurs.c @@ -6,7 +6,6 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "mga.h" #include "mga_reg.h" diff --git a/src/mga_merge.c b/src/mga_merge.c index f355f76..9045b63 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -10,8 +10,6 @@ #include "compiler.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" #include "mga.h" #include "mga_macros.h" #include "mga_reg.h" diff --git a/src/mga_shadow.c b/src/mga_shadow.c index f928690..4842e3a 100644 --- a/src/mga_shadow.c +++ b/src/mga_shadow.c @@ -9,7 +9,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "mga_reg.h" #include "mga.h" diff --git a/src/mga_storm.c b/src/mga_storm.c index 7ac3ae0..a0189a6 100644 --- a/src/mga_storm.c +++ b/src/mga_storm.c @@ -14,9 +14,6 @@ /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that use XAA need this */ #include "xaa.h" #include "xaalocal.h" diff --git a/src/mga_video.c b/src/mga_video.c index abce31f..2b755d7 100644 --- a/src/mga_video.c +++ b/src/mga_video.c @@ -5,7 +5,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86fbman.h" #include "regionstr.h" -- cgit v1.2.3