Skip to content

Commit

Permalink
drm/gem: add hooks to notify driver when object handle is created/des…
Browse files Browse the repository at this point in the history
…troyed

Nouveau is going to use these hooks to map/unmap objects from a client's
private GPU address space.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Ben Skeggs authored and Dave Airlie committed Jun 21, 2011
1 parent a377e18 commit 304eda3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
21 changes: 19 additions & 2 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
idr_remove(&filp->object_idr, handle);
spin_unlock(&filp->table_lock);

if (dev->driver->gem_close_object)
dev->driver->gem_close_object(obj, filp);
drm_gem_object_handle_unreference_unlocked(obj);

return 0;
Expand All @@ -226,7 +228,8 @@ drm_gem_handle_create(struct drm_file *file_priv,
struct drm_gem_object *obj,
u32 *handlep)
{
int ret;
struct drm_device *dev = obj->dev;
int ret;

/*
* Get the user-visible handle using idr.
Expand All @@ -247,6 +250,15 @@ drm_gem_handle_create(struct drm_file *file_priv,
return ret;

drm_gem_object_handle_reference(obj);

if (dev->driver->gem_open_object) {
ret = dev->driver->gem_open_object(obj, file_priv);
if (ret) {
drm_gem_handle_delete(file_priv, *handlep);
return ret;
}
}

return 0;
}
EXPORT_SYMBOL(drm_gem_handle_create);
Expand Down Expand Up @@ -401,7 +413,12 @@ drm_gem_open(struct drm_device *dev, struct drm_file *file_private)
static int
drm_gem_object_release_handle(int id, void *ptr, void *data)
{
struct drm_file *file_priv = data;
struct drm_gem_object *obj = ptr;
struct drm_device *dev = obj->dev;

if (dev->driver->gem_close_object)
dev->driver->gem_close_object(obj, file_priv);

drm_gem_object_handle_unreference_unlocked(obj);

Expand All @@ -417,7 +434,7 @@ void
drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
{
idr_for_each(&file_private->object_idr,
&drm_gem_object_release_handle, NULL);
&drm_gem_object_release_handle, file_private);

idr_remove_all(&file_private->object_idr);
idr_destroy(&file_private->object_idr);
Expand Down
2 changes: 2 additions & 0 deletions include/drm/drmP.h
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,8 @@ struct drm_driver {
*/
int (*gem_init_object) (struct drm_gem_object *obj);
void (*gem_free_object) (struct drm_gem_object *obj);
int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);

/* vga arb irq handler */
void (*vgaarb_irq)(struct drm_device *dev, bool state);
Expand Down

0 comments on commit 304eda3

Please sign in to comment.