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_fops.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_fops.c')
| -rw-r--r-- | linux-core/drm_fops.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 3bc25f24..ec521101 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -274,6 +274,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp, goto out_free; } + if (dev->driver->driver_features & DRIVER_GEM) + drm_gem_open(dev, priv); + if (dev->driver->open) { ret = dev->driver->open(dev, priv); if (ret < 0) @@ -444,6 +447,9 @@ int drm_release(struct inode *inode, struct file *filp) dev->driver->reclaim_buffers(dev, file_priv); } + if (dev->driver->driver_features & DRIVER_GEM) + drm_gem_release(dev, file_priv); + drm_fasync(-1, filp, 0); mutex_lock(&dev->ctxlist_mutex); |