diff options
author | Kristian Høgsberg <krh@redhat.com> | 2008-07-07 15:43:43 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-07 15:43:43 -0400 |
commit | 3e02f7fd310ae062d250d8db01ddc3b7de3d7943 (patch) | |
tree | cfce44b02b989ad9d7bf2a497e49743e15d77168 /linux-core/drmP.h | |
parent | 7fd8a5de63781f6faa053509c80e02e8f1cdbb69 (diff) | |
parent | d250a55fc6a726a8bfaf4f871eeb09c895a9ba51 (diff) |
Merge commit 'origin/drm-gem' into ms-gem
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/i915_drv.c
linux-core/i915_gem.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r-- | linux-core/drmP.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 8c745502..708b4fa0 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -811,6 +811,10 @@ struct drm_driver { /* Master routines */ int (*master_create)(struct drm_device *dev, struct drm_master *master); void (*master_destroy)(struct drm_device *dev, struct drm_master *master); + + int (*proc_init)(struct drm_minor *minor); + void (*proc_cleanup)(struct drm_minor *minor); + /** * Driver-specific constructor for drm_gem_objects, to set up * obj->driver_private. @@ -1366,7 +1370,7 @@ extern void drm_put_master(struct drm_master *master); extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, struct drm_driver *driver); extern int drm_put_dev(struct drm_device *dev); -extern int drm_put_minor(struct drm_minor **minor); +extern int drm_put_minor(struct drm_device *dev, struct drm_minor **p); extern unsigned int drm_debug; /* 1 to enable debug output */ extern struct class *drm_class; |