diff options
| author | Eric Anholt <eric@anholt.net> | 2008-08-08 14:05:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-08-08 14:05:01 -0700 |
| commit | e1b8e79796b172c356af98eb49107c8abbebfe5a (patch) | |
| tree | 4af674ca495ca93535f057ea4c0385c57825c2e4 /linux-core/drm_drv.c | |
| parent | 0c47151a571827905c34649208e22f8ec0175d62 (diff) | |
| parent | 46e9274e8538e5b0517f611dca99dde611f4e95d (diff) | |
Merge branch 'drm-gem'
Conflicts:
shared-core/i915_dma.c
This brings in kernel support and userland interface for intel GEM.
Diffstat (limited to 'linux-core/drm_drv.c')
| -rw-r--r-- | linux-core/drm_drv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 6ac2adf3..efd6416f 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -150,6 +150,10 @@ static struct drm_ioctl_desc drm_ioctls[] = { DRM_IOCTL_DEF(DRM_IOCTL_BO_VERSION, drm_bo_version_ioctl, 0), DRM_IOCTL_DEF(DRM_IOCTL_MM_INFO, drm_mm_info_ioctl, 0), + + DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0), + DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH), + DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH), }; #define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls ) @@ -418,7 +422,7 @@ static void drm_cleanup(struct drm_device * dev) drm_mm_takedown(&dev->offset_manager); drm_ht_remove(&dev->object_hash); - drm_put_minor(&dev->primary); + drm_put_minor(dev); if (drm_put_dev(dev)) DRM_ERROR("Cannot unload module\n"); } |