From patchwork Wed Jun 8 07:33:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Skeggs X-Patchwork-Id: 860892 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p587VeKt000781 for ; Wed, 8 Jun 2011 07:32:05 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 55B589F0E6 for ; Wed, 8 Jun 2011 00:31:39 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id E150A9E7A4 for ; Wed, 8 Jun 2011 00:31:29 -0700 (PDT) Received: by qwi2 with SMTP id 2so115310qwi.36 for ; Wed, 08 Jun 2011 00:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=+bIjgmmPSDfaF5fpxxeN/p42AebCJkNr9YbpQ8m1S38=; b=VHt17+H61fImoVXSYY87HLxBuUGaxri8/deJvOu4CEO0kvFGxe69ENIVKJ3r+kVroL rO/qkCqkGRiohZv+/LGeIKQTq7+PHghpc0hv5eUEd+Mqv8NGoYX68qOD+mWDJlgJjOoT QQQd7guYyXruVlnfufNYjPZvE41TDa2jDkOus= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=AtznCrXO1f0OlF9O4MsjCCE7L7ZRGlx7Aw9fWSOjw85vLv+VHY8apmYceAn0m40RUP xQCREXNDepl74mThkLV/1RCCUiXNi8cwLOJUE+8Z0drjy5tXHXycvf4ZdrzFZF3dsxOp 7KdiXskITtjkhypbFrDzVON4pP3SAxudzDh7k= Received: by 10.224.187.9 with SMTP id cu9mr3492829qab.381.1307518289275; Wed, 08 Jun 2011 00:31:29 -0700 (PDT) Received: from nisroch.redhat.com (203-214-112-200.dyn.iinet.net.au [203.214.112.200]) by mx.google.com with ESMTPS id mz7sm216308qcb.11.2011.06.08.00.31.26 (version=SSLv3 cipher=OTHER); Wed, 08 Jun 2011 00:31:28 -0700 (PDT) From: skeggsb@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/gem: add hooks to notify driver when object handle is created/destroyed Date: Wed, 8 Jun 2011 17:33:58 +1000 Message-Id: <1307518438-20547-1-git-send-email-skeggsb@gmail.com> X-Mailer: git-send-email 1.7.5.2 Cc: Ben Skeggs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Jun 2011 07:32:05 +0000 (UTC) From: Ben Skeggs Nouveau is going to use these hooks to map/unmap objects from a client's private GPU address space. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/drm_gem.c | 21 +++++++++++++++++++-- include/drm/drmP.h | 2 ++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 74e4ff5..59d2417 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -207,6 +207,8 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) dev = obj->dev; /* Release reference and decrement refcount. */ + if (dev->driver->gem_close_object) + dev->driver->gem_close_object(obj, filp); idr_remove(&filp->object_idr, handle); spin_unlock(&filp->table_lock); @@ -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. @@ -247,6 +250,15 @@ again: 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); @@ -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); @@ -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); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 738b3a5..4912cb7 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -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);