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

Commit 4efafebe authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: kill the ->agp_destroy callback 



Call drm_pci_agp_destroy directly, there's no point in the
indirection. Long term we want to shuffle this into each driver's
unload logic, but that needs cleared-up drm lifetime rules first.

v2: Add a dummy function for !CONFIG_PCI, spotted my David Herrmann.

v3: Fixup for the coding style police.

Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d6e4b28b

drivers/gpu/drm/drm_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void drm_pci_agp_init(struct drm_device *dev) 
	}

}



static void drm_pci_agp_destroy(struct drm_device *dev)

void drm_pci_agp_destroy(struct drm_device *dev)

{

	if (dev->agp) {

		arch_phys_wc_del(dev->agp->agp_mtrr);
@@ -293,7 +293,6 @@ static struct drm_bus drm_pci_bus = { 
	.set_busid = drm_pci_set_busid,

	.set_unique = drm_pci_set_unique,

	.irq_by_busid = drm_pci_irq_by_busid,

	.agp_destroy = drm_pci_agp_destroy,

};



/**
@@ -457,6 +456,7 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) 
	return -1;

}



void drm_pci_agp_destroy(struct drm_device *dev) {}

#endif



EXPORT_SYMBOL(drm_pci_init);

drivers/gpu/drm/drm_stub.c

+2 −2
Original line number Diff line number Diff line
@@ -592,8 +592,8 @@ void drm_dev_unregister(struct drm_device *dev) 
	if (dev->driver->unload)

		dev->driver->unload(dev);



	if (dev->driver->bus->agp_destroy)

		dev->driver->bus->agp_destroy(dev);

	if (dev->agp)

		drm_pci_agp_destroy(dev);



	drm_vblank_cleanup(dev);

include/drm/drmP.h

+1 −3
Original line number Diff line number Diff line
@@ -766,9 +766,6 @@ struct drm_bus { 
	int (*set_unique)(struct drm_device *dev, struct drm_master *master,

			  struct drm_unique *unique);

	int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p);

	/* hooks that are for PCI */

	void (*agp_destroy)(struct drm_device *dev);



};



/**
@@ -1684,6 +1681,7 @@ static __inline__ int drm_pci_device_is_agp(struct drm_device *dev) 


	return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);

}

void drm_pci_agp_destroy(struct drm_device *dev);



extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);

extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);