diff options
author | Jon Mason <jdmason@kudzu.us> | 2011-06-27 12:07:50 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-07-13 03:14:52 -0400 |
commit | 58b6542b50ded4243c26c251c0507e5f658642f6 (patch) | |
tree | f2cf26ee85607daf86983b3d10871e186a0c7dde /drivers/gpu/drm/nouveau/nouveau_sgdma.c | |
parent | d52589b785404c944e734ecc4e1d42326197613c (diff) |
DRM: remove drm_pci_device_is_pcie
drm_pci_device_is_pcie duplicates the funcationality of pci_is_pcie.
Convert callers of the former to the latter. This has the side benefit
of removing an unnecessary search in the PCI configuration space due to
using a saved PCIe capability offset.
[airlied: update for new callsite]
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_sgdma.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index 82fad914e64..c444cadbf84 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | |||
@@ -429,7 +429,7 @@ nouveau_sgdma_init(struct drm_device *dev) | |||
429 | u32 aper_size, align; | 429 | u32 aper_size, align; |
430 | int ret; | 430 | int ret; |
431 | 431 | ||
432 | if (dev_priv->card_type >= NV_40 && drm_pci_device_is_pcie(dev)) | 432 | if (dev_priv->card_type >= NV_40 && pci_is_pcie(dev->pdev)) |
433 | aper_size = 512 * 1024 * 1024; | 433 | aper_size = 512 * 1024 * 1024; |
434 | else | 434 | else |
435 | aper_size = 64 * 1024 * 1024; | 435 | aper_size = 64 * 1024 * 1024; |
@@ -458,7 +458,7 @@ nouveau_sgdma_init(struct drm_device *dev) | |||
458 | dev_priv->gart_info.type = NOUVEAU_GART_HW; | 458 | dev_priv->gart_info.type = NOUVEAU_GART_HW; |
459 | dev_priv->gart_info.func = &nv50_sgdma_backend; | 459 | dev_priv->gart_info.func = &nv50_sgdma_backend; |
460 | } else | 460 | } else |
461 | if (0 && drm_pci_device_is_pcie(dev) && | 461 | if (0 && pci_is_pcie(dev->pdev) && |
462 | dev_priv->chipset > 0x40 && dev_priv->chipset != 0x45) { | 462 | dev_priv->chipset > 0x40 && dev_priv->chipset != 0x45) { |
463 | if (nv44_graph_class(dev)) { | 463 | if (nv44_graph_class(dev)) { |
464 | dev_priv->gart_info.func = &nv44_sgdma_backend; | 464 | dev_priv->gart_info.func = &nv44_sgdma_backend; |