diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2013-10-02 11:23:35 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 15:54:31 +1000 |
commit | c22f0ace1926da399d9a16dfaf09174c1b03594c (patch) | |
tree | 9c82626f939917cba7ab3626a22fe61d52940ec9 /include/drm | |
parent | 1bb72532ac260a2d3982b40bdd4c936d779d0d16 (diff) | |
download | linux-c22f0ace1926da399d9a16dfaf09174c1b03594c.tar.bz2 |
drm: merge device setup into drm_dev_register()
All bus drivers do device setup themselves. This requires us to adjust all
of them if we introduce new core features. Thus, merge all these into a
uniform drm_dev_register() helper.
Note that this removes the drm_lastclose() error path for AGP as it is
horribly broken. Moreover, no bus driver called this in any other error
path either. Instead, we use the recently introduced AGP cleanup helpers.
We also keep a DRIVER_MODESET condition around pci_set_drvdata() to keep
semantics.
[airlied: keep passing flags through so drivers don't oops on load]
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drmP.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index ea545b5ad467..1973f7966511 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1640,11 +1640,9 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map) #include <drm/drm_mem_util.h> -extern int drm_fill_in_dev(struct drm_device *dev, - const struct pci_device_id *ent, - struct drm_driver *driver); struct drm_device *drm_dev_alloc(struct drm_driver *driver, struct device *parent); +int drm_dev_register(struct drm_device *dev, unsigned long flags); int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type); /*@}*/ |