intel: drop RES_SHARED_VGA not needed anymore
This commit is contained in:
Dave Airlie
parent
f3387310f3
commit
50e2a6734d
|
|
@ -56,10 +56,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86cmap.h"
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
#include "xf86RAC.h"
|
||||
#endif
|
||||
|
||||
#include "compiler.h"
|
||||
#include "mibstore.h"
|
||||
|
|
@ -201,40 +197,40 @@ static SymTabRec I810Chipsets[] = {
|
|||
|
||||
static PciChipsets I810PciChipsets[] = {
|
||||
#ifndef I830_ONLY
|
||||
{PCI_CHIP_I810, PCI_CHIP_I810, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I810_DC100, PCI_CHIP_I810_DC100, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I810_E, PCI_CHIP_I810_E, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I815, PCI_CHIP_I815, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I810, PCI_CHIP_I810, NULL},
|
||||
{PCI_CHIP_I810_DC100, PCI_CHIP_I810_DC100, NULL},
|
||||
{PCI_CHIP_I810_E, PCI_CHIP_I810_E, NULL},
|
||||
{PCI_CHIP_I815, PCI_CHIP_I815, NULL},
|
||||
#endif
|
||||
{PCI_CHIP_I830_M, PCI_CHIP_I830_M, RES_SHARED_VGA},
|
||||
{PCI_CHIP_845_G, PCI_CHIP_845_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I855_GM, PCI_CHIP_I855_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I865_G, PCI_CHIP_I865_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I915_G, PCI_CHIP_I915_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I945_GME, PCI_CHIP_I945_GME, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGD_GM, PCI_CHIP_IGD_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGD_G, PCI_CHIP_IGD_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_G, PCI_CHIP_I965_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G35_G, PCI_CHIP_G35_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_Q, PCI_CHIP_I965_Q, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I946_GZ, PCI_CHIP_I946_GZ, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_GM, PCI_CHIP_I965_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_GME, PCI_CHIP_I965_GME, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G33_G, PCI_CHIP_G33_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_Q35_G, PCI_CHIP_Q35_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_Q33_G, PCI_CHIP_Q33_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_GM45_GM, PCI_CHIP_GM45_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G45_G, PCI_CHIP_G45_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G41_G, PCI_CHIP_G41_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, RES_SHARED_VGA},
|
||||
{-1, -1, RES_UNDEFINED }
|
||||
{PCI_CHIP_I830_M, PCI_CHIP_I830_M, NULL},
|
||||
{PCI_CHIP_845_G, PCI_CHIP_845_G, NULL},
|
||||
{PCI_CHIP_I855_GM, PCI_CHIP_I855_GM, NULL},
|
||||
{PCI_CHIP_I865_G, PCI_CHIP_I865_G, NULL},
|
||||
{PCI_CHIP_I915_G, PCI_CHIP_I915_G, NULL},
|
||||
{PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, NULL},
|
||||
{PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, NULL},
|
||||
{PCI_CHIP_I945_G, PCI_CHIP_I945_G, NULL},
|
||||
{PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, NULL},
|
||||
{PCI_CHIP_I945_GME, PCI_CHIP_I945_GME, NULL},
|
||||
{PCI_CHIP_IGD_GM, PCI_CHIP_IGD_GM, NULL},
|
||||
{PCI_CHIP_IGD_G, PCI_CHIP_IGD_G, NULL},
|
||||
{PCI_CHIP_I965_G, PCI_CHIP_I965_G, NULL},
|
||||
{PCI_CHIP_G35_G, PCI_CHIP_G35_G, NULL},
|
||||
{PCI_CHIP_I965_Q, PCI_CHIP_I965_Q, NULL},
|
||||
{PCI_CHIP_I946_GZ, PCI_CHIP_I946_GZ, NULL},
|
||||
{PCI_CHIP_I965_GM, PCI_CHIP_I965_GM, NULL},
|
||||
{PCI_CHIP_I965_GME, PCI_CHIP_I965_GME, NULL},
|
||||
{PCI_CHIP_G33_G, PCI_CHIP_G33_G, NULL},
|
||||
{PCI_CHIP_Q35_G, PCI_CHIP_Q35_G, NULL},
|
||||
{PCI_CHIP_Q33_G, PCI_CHIP_Q33_G, NULL},
|
||||
{PCI_CHIP_GM45_GM, PCI_CHIP_GM45_GM, NULL},
|
||||
{PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, NULL},
|
||||
{PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL},
|
||||
{PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL},
|
||||
{PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL},
|
||||
{PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL},
|
||||
{PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL},
|
||||
{-1, -1, NULL }
|
||||
};
|
||||
|
||||
#ifndef I830_ONLY
|
||||
|
|
|
|||
|
|
@ -53,10 +53,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "xf86_OSproc.h"
|
||||
#include "xf86Priv.h"
|
||||
#include "xf86cmap.h"
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
#include "xf86RAC.h"
|
||||
#endif
|
||||
#include "compiler.h"
|
||||
#include "mibstore.h"
|
||||
#include "vgaHW.h"
|
||||
|
|
@ -126,35 +122,35 @@ static SymTabRec I830Chipsets[] = {
|
|||
};
|
||||
|
||||
static PciChipsets I830PciChipsets[] = {
|
||||
{PCI_CHIP_I830_M, PCI_CHIP_I830_M, RES_SHARED_VGA},
|
||||
{PCI_CHIP_845_G, PCI_CHIP_845_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I855_GM, PCI_CHIP_I855_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I865_G, PCI_CHIP_I865_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I915_G, PCI_CHIP_I915_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I945_GME, PCI_CHIP_I945_GME, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGD_GM, PCI_CHIP_IGD_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGD_G, PCI_CHIP_IGD_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_G, PCI_CHIP_I965_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G35_G, PCI_CHIP_G35_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_Q, PCI_CHIP_I965_Q, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I946_GZ, PCI_CHIP_I946_GZ, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_GM, PCI_CHIP_I965_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_I965_GME, PCI_CHIP_I965_GME, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G33_G, PCI_CHIP_G33_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_Q35_G, PCI_CHIP_Q35_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_Q33_G, PCI_CHIP_Q33_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_GM45_GM, PCI_CHIP_GM45_GM, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G45_G, PCI_CHIP_G45_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_G41_G, PCI_CHIP_G41_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, RES_SHARED_VGA},
|
||||
{PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, RES_SHARED_VGA},
|
||||
{-1, -1, RES_UNDEFINED}
|
||||
{PCI_CHIP_I830_M, PCI_CHIP_I830_M, NULL},
|
||||
{PCI_CHIP_845_G, PCI_CHIP_845_G, NULL},
|
||||
{PCI_CHIP_I855_GM, PCI_CHIP_I855_GM, NULL},
|
||||
{PCI_CHIP_I865_G, PCI_CHIP_I865_G, NULL},
|
||||
{PCI_CHIP_I915_G, PCI_CHIP_I915_G, NULL},
|
||||
{PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, NULL},
|
||||
{PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, NULL},
|
||||
{PCI_CHIP_I945_G, PCI_CHIP_I945_G, NULL},
|
||||
{PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, NULL},
|
||||
{PCI_CHIP_I945_GME, PCI_CHIP_I945_GME, NULL},
|
||||
{PCI_CHIP_IGD_GM, PCI_CHIP_IGD_GM, NULL},
|
||||
{PCI_CHIP_IGD_G, PCI_CHIP_IGD_G, NULL},
|
||||
{PCI_CHIP_I965_G, PCI_CHIP_I965_G, NULL},
|
||||
{PCI_CHIP_G35_G, PCI_CHIP_G35_G, NULL},
|
||||
{PCI_CHIP_I965_Q, PCI_CHIP_I965_Q, NULL},
|
||||
{PCI_CHIP_I946_GZ, PCI_CHIP_I946_GZ, NULL},
|
||||
{PCI_CHIP_I965_GM, PCI_CHIP_I965_GM, NULL},
|
||||
{PCI_CHIP_I965_GME, PCI_CHIP_I965_GME, NULL},
|
||||
{PCI_CHIP_G33_G, PCI_CHIP_G33_G, NULL},
|
||||
{PCI_CHIP_Q35_G, PCI_CHIP_Q35_G, NULL},
|
||||
{PCI_CHIP_Q33_G, PCI_CHIP_Q33_G, NULL},
|
||||
{PCI_CHIP_GM45_GM, PCI_CHIP_GM45_GM, NULL},
|
||||
{PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, NULL},
|
||||
{PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL},
|
||||
{PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL},
|
||||
{PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL},
|
||||
{PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL},
|
||||
{PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL},
|
||||
{-1, -1, NULL}
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue