On Wed, Jan 25, 2017 at 1:26 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > It's only for a device quirk, and we might as well do that in the load > callback. > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/mga/mga_dma.c | 20 +++++++++++++++++++- > drivers/gpu/drm/mga/mga_drv.c | 37 ------------------------------------- > 2 files changed, 19 insertions(+), 38 deletions(-) > > diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c > index a1d8dd15b131..1ffdafea27e4 100644 > --- a/drivers/gpu/drm/mga/mga_dma.c > +++ b/drivers/gpu/drm/mga/mga_dma.c > @@ -392,6 +392,24 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags) > drm_mga_private_t *dev_priv; > int ret; > > + /* There are PCI versions of the G450. These cards have the > + * same PCI ID as the AGP G450, but have an additional PCI-to-PCI > + * bridge chip. We detect these cards, which are not currently > + * supported by this driver, by looking at the device ID of the > + * bus the "card" is on. If vendor is 0x3388 (Hint Corp) and the > + * device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the > + * device. > + */ > + if ((dev->pdev->device == 0x0525) && dev->pdev->bus->self > + && (dev->pdev->bus->self->vendor == 0x3388) > + && (dev->pdev->bus->self->device == 0x0021) > + && dev->agp) { > + /* FIXME: This should be quirked in the pci core, but oh well > + * the hw probably stopped existing. */ > + arch_phys_wc_del(dev->agp->agp_mtrr); > + kfree(dev->agp); > + dev->agp = NULL; > + } > dev_priv = kzalloc(sizeof(drm_mga_private_t), GFP_KERNEL); > if (!dev_priv) > return -ENOMEM; > @@ -698,7 +716,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device *dev, > static int mga_do_dma_bootstrap(struct drm_device *dev, > drm_mga_dma_bootstrap_t *dma_bs) > { > - const int is_agp = (dma_bs->agp_mode != 0) && drm_pci_device_is_agp(dev); > + const int is_agp = (dma_bs->agp_mode != 0) && dev->agp; > int err; > drm_mga_private_t *const dev_priv = > (drm_mga_private_t *) dev->dev_private; > diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c > index 25b2a1a424e6..63ba0699d107 100644 > --- a/drivers/gpu/drm/mga/mga_drv.c > +++ b/drivers/gpu/drm/mga/mga_drv.c > @@ -37,8 +37,6 @@ > > #include <drm/drm_pciids.h> > > -static int mga_driver_device_is_agp(struct drm_device *dev); > - > static struct pci_device_id pciidlist[] = { > mga_PCI_IDS > }; > @@ -66,7 +64,6 @@ static struct drm_driver driver = { > .lastclose = mga_driver_lastclose, > .set_busid = drm_pci_set_busid, > .dma_quiescent = mga_driver_dma_quiescent, > - .device_is_agp = mga_driver_device_is_agp, > .get_vblank_counter = mga_get_vblank_counter, > .enable_vblank = mga_enable_vblank, > .disable_vblank = mga_disable_vblank, > @@ -107,37 +104,3 @@ module_exit(mga_exit); > MODULE_AUTHOR(DRIVER_AUTHOR); > MODULE_DESCRIPTION(DRIVER_DESC); > MODULE_LICENSE("GPL and additional rights"); > - > -/** > - * Determine if the device really is AGP or not. > - * > - * In addition to the usual tests performed by \c drm_device_is_agp, this > - * function detects PCI G450 cards that appear to the system exactly like > - * AGP G450 cards. > - * > - * \param dev The device to be tested. > - * > - * \returns > - * If the device is a PCI G450, zero is returned. Otherwise 2 is returned. > - */ > -static int mga_driver_device_is_agp(struct drm_device *dev) > -{ > - const struct pci_dev *const pdev = dev->pdev; > - > - /* There are PCI versions of the G450. These cards have the > - * same PCI ID as the AGP G450, but have an additional PCI-to-PCI > - * bridge chip. We detect these cards, which are not currently > - * supported by this driver, by looking at the device ID of the > - * bus the "card" is on. If vendor is 0x3388 (Hint Corp) and the > - * device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the > - * device. > - */ > - > - if ((pdev->device == 0x0525) && pdev->bus->self > - && (pdev->bus->self->vendor == 0x3388) > - && (pdev->bus->self->device == 0x0021)) { > - return 0; > - } > - > - return 2; > -} > -- > 2.11.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel