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

Commit 2ce0264d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: remove device_is_agp callback 



With that the drm_pci_device_is_agp function becomes trivial, so
inline that too. And while at it, move the drm_pci_agp_destroy
declaration into drm-internal.h, since it's not used by drivers.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170125062657.19270-11-daniel.vetter@ffwll.ch
parent 858b2c1b

drivers/gpu/drm/drm_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ void drm_lastclose(struct drm_device *dev); 
/* drm_pci.c */

int drm_irq_by_busid(struct drm_device *dev, void *data,

		     struct drm_file *file_priv);

void drm_pci_agp_destroy(struct drm_device *dev);



/* drm_prime.c */

int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,

drivers/gpu/drm/drm_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, 
static void drm_pci_agp_init(struct drm_device *dev)

{

	if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {

		if (drm_pci_device_is_agp(dev))

		if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))

			dev->agp = drm_agp_init(dev);

		if (dev->agp) {

			dev->agp->agp_mtrr = arch_phys_wc_add(

drivers/gpu/drm/nouveau/nouveau_abi16.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
		if (!nvxx_device(device)->func->pci)

			getparam->value = 3;

		else

		if (drm_pci_device_is_agp(dev))

		if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))

			getparam->value = 0;

		else

		if (!pci_is_pcie(dev->pdev))

drivers/gpu/drm/radeon/radeon_cs.c

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) 
		   VRAM, also but everything into VRAM on AGP cards and older

		   IGP chips to avoid image corruptions */

		if (p->ring == R600_RING_TYPE_UVD_INDEX &&

		    (i == 0 || drm_pci_device_is_agp(p->rdev->ddev) ||

		    (i == 0 || pci_find_capability(p->rdev->ddev->pdev,

						   PCI_CAP_ID_AGP) ||

		     p->rdev->family == CHIP_RS780 ||

		     p->rdev->family == CHIP_RS880)) {

drivers/gpu/drm/radeon/radeon_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) 
	dev->dev_private = (void *)rdev;



	/* update BUS flag */

	if (drm_pci_device_is_agp(dev)) {

	if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP)) {

		flags |= RADEON_IS_AGP;

	} else if (pci_is_pcie(dev->pdev)) {

		flags |= RADEON_IS_PCIE;