Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58b6542b authored by Jon Mason's avatar Jon Mason Committed by Dave Airlie
Browse files

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: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d52589b7

drivers/gpu/drm/nouveau/nouveau_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -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)))

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ nouveau_sgdma_init(struct drm_device *dev) 
	u32 aper_size, align;

	int ret;



	if (dev_priv->card_type >= NV_40 && drm_pci_device_is_pcie(dev))

	if (dev_priv->card_type >= NV_40 && pci_is_pcie(dev->pdev))

		aper_size = 512 * 1024 * 1024;

	else

		aper_size = 64 * 1024 * 1024;
@@ -458,7 +458,7 @@ nouveau_sgdma_init(struct drm_device *dev) 
		dev_priv->gart_info.type = NOUVEAU_GART_HW;

		dev_priv->gart_info.func = &nv50_sgdma_backend;

	} 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 (nv44_graph_class(dev)) {

			dev_priv->gart_info.func = &nv44_sgdma_backend;

drivers/gpu/drm/nouveau/nouveau_state.c

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ int nouveau_ioctl_getparam(struct drm_device *dev, void *data, 
	case NOUVEAU_GETPARAM_BUS_TYPE:

		if (drm_pci_device_is_agp(dev))

			getparam->value = NV_AGP;

		else if (drm_pci_device_is_pcie(dev))

		else if (pci_is_pcie(dev->pdev))

			getparam->value = NV_PCIE;

		else

			getparam->value = NV_PCI;

drivers/gpu/drm/nouveau/nv04_instmem.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int nv04_instmem_init(struct drm_device *dev) 
		rsvd *= dev_priv->engine.fifo.channels;



		/* pciegart table */

		if (drm_pci_device_is_pcie(dev))

		if (pci_is_pcie(dev->pdev))

			rsvd += 512 * 1024;



		/* object storage */

drivers/gpu/drm/radeon/radeon_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -2115,7 +2115,7 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) 


	if (drm_pci_device_is_agp(dev))

		dev_priv->flags |= RADEON_IS_AGP;

	else if (drm_pci_device_is_pcie(dev))

	else if (pci_is_pcie(dev->pdev))

		dev_priv->flags |= RADEON_IS_PCIE;

	else

		dev_priv->flags |= RADEON_IS_PCI;