diff options
| author | Jon Mason <jdmason@kudzu.us> | 2011-06-27 16:07:50 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-07-13 08:14:52 +0100 |
| commit | 58b6542b50ded4243c26c251c0507e5f658642f6 (patch) | |
| tree | f2cf26ee85607daf86983b3d10871e186a0c7dde /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | d52589b785404c944e734ecc4e1d42326197613c (diff) | |
| download | lwn-58b6542b50ded4243c26c251c0507e5f658642f6.tar.gz lwn-58b6542b50ded4243c26c251c0507e5f658642f6.zip | |
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_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 81dadeb9debc..f9ae2fc3d6f1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -397,7 +397,7 @@ nouveau_mem_vram_init(struct drm_device *dev) if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(40))) dma_bits = 40; } else - if (0 && drm_pci_device_is_pcie(dev) && + if (0 && pci_is_pcie(dev->pdev) && dev_priv->chipset > 0x40 && dev_priv->chipset != 0x45) { if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39))) |