diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:36 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:22:30 -0500 |
commit | 2c695fa0444273c7139a3ca4c324c95498a0bfed (patch) | |
tree | 3612a56b876fd3773dc6a07083ec6120a08ad0fd /include/drm | |
parent | d9906753bb997d651beaba0e4026a873bd0e8340 (diff) |
drm: remove agp_init() bus callback
The PCI bus helper is the only user of it. Call it directly before
device-registration to get rid of the callback.
Note that all drm_agp_*() calls are locked with the drm-global-mutex so we
need to explicitly lock it during initialization. It's not really clear
why it's needed, but lets be safe.
v2: Rebase on top of the agp_init interface change.
v3: Remove the rebase-fail where I've accidentally killed the ->irq_by_busid
callback a bit too early.
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com> (v1)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drmP.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 04909a80735d..50a54c069518 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -767,7 +767,6 @@ struct drm_bus { | |||
767 | struct drm_unique *unique); | 767 | struct drm_unique *unique); |
768 | int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); | 768 | int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); |
769 | /* hooks that are for PCI */ | 769 | /* hooks that are for PCI */ |
770 | void (*agp_init)(struct drm_device *dev); | ||
771 | void (*agp_destroy)(struct drm_device *dev); | 770 | void (*agp_destroy)(struct drm_device *dev); |
772 | 771 | ||
773 | }; | 772 | }; |