drm: Make drm_pci_agp_init legacy (ee21ec77) · Commits · 戴 / test

Pull the drm_pci_agp_init() underneath the legacy ifdeffry alongside its only caller. The diff chooses it to so it by moving drm_pci_agp_destroy earlier, but the important bit is moving the #ifdef earlier before drm_pci_agp_init. Signed-off-by:

Chris Wilson <chris@chris-wilson.co.uk> Acked-by:

Sam Ravnborg <sam@ravnborg.org> Reviewed-by:

Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20200307093702.2269-1-chris@chris-wilson.co.uk

drivers/gpu/drm/drm_pci.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -166,6 +166,18 @@ int drm_irq_by_busid(struct drm_device dev, void data,
		return drm_pci_irq_by_busid(dev, p);
		}

		void drm_pci_agp_destroy(struct drm_device *dev)
		{
		if (dev->agp) {
		arch_phys_wc_del(dev->agp->agp_mtrr);
		drm_legacy_agp_clear(dev);
		kfree(dev->agp);
		dev->agp = NULL;
		}
		}

		#ifdef CONFIG_DRM_LEGACY

		static void drm_pci_agp_init(struct drm_device *dev)
		{
		if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
		@@ -180,18 +192,6 @@ static void drm_pci_agp_init(struct drm_device *dev)
		}
		}

		void drm_pci_agp_destroy(struct drm_device *dev)
		{
		if (dev->agp) {
		arch_phys_wc_del(dev->agp->agp_mtrr);
		drm_legacy_agp_clear(dev);
		kfree(dev->agp);
		dev->agp = NULL;
		}
		}

		#ifdef CONFIG_DRM_LEGACY

		static int drm_get_pci_dev(struct pci_dev *pdev,
		const struct pci_device_id *ent,
		struct drm_driver *driver)

Admin message