diff options
author | Dave Airlie <airlied@redhat.com> | 2012-05-20 12:31:16 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 05:46:03 -0400 |
commit | 0ff926c7d4f06f9703226dc09acad17e86f169d6 (patch) | |
tree | c0f4036c17f0fe5944ca56ef519774f0f9b3ad45 /drivers/gpu/drm/drm_gem.c | |
parent | 51ab7ba2673758561074184795bba5bac780a038 (diff) |
drm/prime: add exported buffers to current fprivs imported buffer list (v2)
If userspace attempts to import a buffer it exported on the same device,
we need to return the same GEM handle for it, not a new handle pointing
at the same GEM object.
v2: move removals into a single fn, no need to set to NULL. (Chris Wilson)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
-rw-r--r-- | drivers/gpu/drm/drm_gem.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 72ba0757feaa..d58e69da1fb5 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
@@ -201,6 +201,19 @@ free: | |||
201 | } | 201 | } |
202 | EXPORT_SYMBOL(drm_gem_object_alloc); | 202 | EXPORT_SYMBOL(drm_gem_object_alloc); |
203 | 203 | ||
204 | static void | ||
205 | drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp) | ||
206 | { | ||
207 | if (obj->import_attach) { | ||
208 | drm_prime_remove_imported_buf_handle(&filp->prime, | ||
209 | obj->import_attach->dmabuf); | ||
210 | } | ||
211 | if (obj->export_dma_buf) { | ||
212 | drm_prime_remove_imported_buf_handle(&filp->prime, | ||
213 | obj->export_dma_buf); | ||
214 | } | ||
215 | } | ||
216 | |||
204 | /** | 217 | /** |
205 | * Removes the mapping from handle to filp for this object. | 218 | * Removes the mapping from handle to filp for this object. |
206 | */ | 219 | */ |
@@ -233,9 +246,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) | |||
233 | idr_remove(&filp->object_idr, handle); | 246 | idr_remove(&filp->object_idr, handle); |
234 | spin_unlock(&filp->table_lock); | 247 | spin_unlock(&filp->table_lock); |
235 | 248 | ||
236 | if (obj->import_attach) | 249 | drm_gem_remove_prime_handles(obj, filp); |
237 | drm_prime_remove_imported_buf_handle(&filp->prime, | ||
238 | obj->import_attach->dmabuf); | ||
239 | 250 | ||
240 | if (dev->driver->gem_close_object) | 251 | if (dev->driver->gem_close_object) |
241 | dev->driver->gem_close_object(obj, filp); | 252 | dev->driver->gem_close_object(obj, filp); |
@@ -530,9 +541,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) | |||
530 | struct drm_gem_object *obj = ptr; | 541 | struct drm_gem_object *obj = ptr; |
531 | struct drm_device *dev = obj->dev; | 542 | struct drm_device *dev = obj->dev; |
532 | 543 | ||
533 | if (obj->import_attach) | 544 | drm_gem_remove_prime_handles(obj, file_priv); |
534 | drm_prime_remove_imported_buf_handle(&file_priv->prime, | ||
535 | obj->import_attach->dmabuf); | ||
536 | 545 | ||
537 | if (dev->driver->gem_close_object) | 546 | if (dev->driver->gem_close_object) |
538 | dev->driver->gem_close_object(obj, file_priv); | 547 | dev->driver->gem_close_object(obj, file_priv); |