leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: kill the ->agp_destroy callback

Browse Source 
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: David Herrmann <dh.herrmann@gmail.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter 2013-12-11 11:34:38 +01:00 committed by Dave Airlie
parent d6e4b28b60
commit 4efafebe70
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_pci.c
View File

@ -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) { if (dev->agp) {
arch_phys_wc_del(dev->agp->agp_mtrr); 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_busid = drm_pci_set_busid,
.set_unique = drm_pci_set_unique, .set_unique = drm_pci_set_unique,
.irq_by_busid = drm_pci_irq_by_busid, .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; return -1;
} }
void drm_pci_agp_destroy(struct drm_device *dev) {}
#endif #endif
EXPORT_SYMBOL(drm_pci_init); EXPORT_SYMBOL(drm_pci_init);

4
drivers/gpu/drm/drm_stub.c
View File

@ -592,8 +592,8 @@ void drm_dev_unregister(struct drm_device *dev)
if (dev->driver->unload) if (dev->driver->unload)
dev->driver->unload(dev); dev->driver->unload(dev);
if (dev->driver->bus->agp_destroy) if (dev->agp)
dev->driver->bus->agp_destroy(dev); drm_pci_agp_destroy(dev);
drm_vblank_cleanup(dev); drm_vblank_cleanup(dev);

4
include/drm/drmP.h
View File

@ -766,9 +766,6 @@ struct drm_bus {
int (*set_unique)(struct drm_device *dev, struct drm_master *master, int (*set_unique)(struct drm_device *dev, struct drm_master *master,
struct drm_unique *unique); struct drm_unique *unique);
int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); 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); 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 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); extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);