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

Commit 3b9a02e8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Fake AGP is dead 



Remove the leftovers, yay!

AGP for i915 kms died long ago with

commit 3bb6ce66
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed Nov 13 22:14:16 2013 +0100

    drm/i915: Kill legeacy AGP for gen3 kms

and with ums now gone to there's really no users any more.

Note that device_is_agp is only called when DRIVER_USE_AGP is set and
since we've unconditionally cleared that since a while there are
really no users left for i915_driver_device_is_agp.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 3271dca4

drivers/gpu/drm/i915/i915_dma.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -1274,13 +1274,3 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
};

};





int i915_max_ioctl = ARRAY_SIZE(i915_ioctls);
 
int i915_max_ioctl = ARRAY_SIZE(i915_ioctls);
 


/*

 * This is really ugly: Because old userspace abused the linux agp interface to

 * manage the gtt, we need to claim that all intel devices are agp.  For

 * otherwise the drm core refuses to initialize the agp support code.

 */

int i915_driver_device_is_agp(struct drm_device *dev)

{

	return 1;

}

drivers/gpu/drm/i915/i915_drv.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -935,8 +935,6 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (PCI_FUNC(pdev->devfn))

	if (PCI_FUNC(pdev->devfn))

		return -ENODEV;

		return -ENODEV;





	driver.driver_features &= ~(DRIVER_USE_AGP);



	return drm_get_pci_dev(pdev, ent, &driver);

	return drm_get_pci_dev(pdev, ent, &driver);

}

}
@@ -1649,7 +1647,6 @@ static struct drm_driver driver = { 
	 * deal with them for Intel hardware.

	 * deal with them for Intel hardware.

	 */

	 */

	.driver_features =

	.driver_features =

	    DRIVER_USE_AGP |

	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |

	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |

	    DRIVER_RENDER,

	    DRIVER_RENDER,

	.load = i915_driver_load,

	.load = i915_driver_load,
@@ -1664,7 +1661,6 @@ static struct drm_driver driver = { 
	.suspend = i915_suspend_legacy,

	.suspend = i915_suspend_legacy,

	.resume = i915_resume_legacy,

	.resume = i915_resume_legacy,





	.device_is_agp = i915_driver_device_is_agp,

#if defined(CONFIG_DEBUG_FS)

#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = i915_debugfs_init,

	.debugfs_init = i915_debugfs_init,

	.debugfs_cleanup = i915_debugfs_cleanup,

	.debugfs_cleanup = i915_debugfs_cleanup,

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -2628,7 +2628,6 @@ extern void i915_driver_preclose(struct drm_device *dev, 
				 struct drm_file *file);

				 struct drm_file *file);

extern void i915_driver_postclose(struct drm_device *dev,

extern void i915_driver_postclose(struct drm_device *dev,

				  struct drm_file *file);

				  struct drm_file *file);

extern int i915_driver_device_is_agp(struct drm_device * dev);

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

			      unsigned long arg);

			      unsigned long arg);