drivers/gpu/drm/openchrome/via_drv.c | 2 +-
drivers/gpu/drm/openchrome/via_ttm.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit c56af4f6dfc8bf3e4ceb26e591de717409c1cf3f
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 4 05:36:51 2017 -0700
Replace drm_pci_device_is_agp with pci_find_capability
Commit 2ce0264d61548b51d5d406ff9f414af10b9c7348 made this change,
so our side needs to change as well.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.c
b/drivers/gpu/drm/openchrome/via_drv.c
index e7a8cde83c05..acd1e3d095c7 100644
--- a/drivers/gpu/drm/openchrome/via_drv.c
+++ b/drivers/gpu/drm/openchrome/via_drv.c
@@ -349,7 +349,7 @@ via_driver_load(struct drm_device *dev, unsigned long
chipset)
#if IS_ENABLED(CONFIG_AGP)
if ((dev_priv->engine_type <= VIA_ENG_H2) ||
- (dev->agp && drm_pci_device_is_agp(dev))) {
+ (dev->agp && pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))) {
ret = via_detect_agp(dev);
if (!ret)
via_agp_engine_init(dev_priv);
diff --git a/drivers/gpu/drm/openchrome/via_ttm.c
b/drivers/gpu/drm/openchrome/via_ttm.c
index 980cf41b3bf4..89319116d015 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -113,7 +113,7 @@ via_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long
size,
struct via_device *dev_priv =
container_of(bdev, struct via_device, bdev);
- if (drm_pci_device_is_agp(dev_priv->dev))
+ if (pci_find_capability(dev_priv->dev->pdev, PCI_CAP_ID_AGP))
return ttm_agp_tt_create(bdev, dev_priv->dev->agp->bridge,
size, page_flags, dummy_read_page);
#endif
@@ -136,7 +136,7 @@ via_ttm_tt_populate(struct ttm_tt *ttm)
return 0;
#if IS_ENABLED(CONFIG_AGP)
- if (drm_pci_device_is_agp(dev_priv->dev))
+ if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
return ttm_agp_tt_populate(ttm);
#endif
@@ -178,7 +178,7 @@ via_ttm_tt_unpopulate(struct ttm_tt *ttm)
unsigned int i;
#if IS_ENABLED(CONFIG_AGP)
- if (drm_pci_device_is_agp(dev_priv->dev)) {
+ if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) {
ttm_agp_tt_unpopulate(ttm);
return;
}
@@ -238,7 +238,7 @@ via_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
man->default_caching = TTM_PL_FLAG_CACHED;
#if IS_ENABLED(CONFIG_AGP)
- if (drm_pci_device_is_agp(dev) && dev->agp != NULL) {
+ if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP) && dev->agp
!= NULL) {
man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
man->available_caching = TTM_PL_FLAG_UNCACHED |
TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
@@ -520,7 +520,7 @@ via_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct
ttm_mem_reg *mem)
case TTM_PL_TT:
#if IS_ENABLED(CONFIG_AGP)
- if (drm_pci_device_is_agp(dev)) {
+ if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) {
mem->bus.is_iomem = !dev->agp->cant_use_aperture;
mem->bus.base = dev->agp->base;
}
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
