From patchwork Wed Aug 10 13:09:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 3369 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A5EA823F41 for ; Wed, 10 Aug 2011 13:09:23 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 576D4A18425 for ; Wed, 10 Aug 2011 13:09:23 +0000 (UTC) Received: by qyk31 with SMTP id 31so3244687qyk.11 for ; Wed, 10 Aug 2011 06:09:22 -0700 (PDT) Received: by 10.229.183.84 with SMTP id cf20mr6259882qcb.121.1312981762816; Wed, 10 Aug 2011 06:09:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.190.71 with SMTP id dh7cs80603qcb; Wed, 10 Aug 2011 06:09:22 -0700 (PDT) Received: by 10.236.193.106 with SMTP id j70mr6866070yhn.86.1312981762233; Wed, 10 Aug 2011 06:09:22 -0700 (PDT) Received: from mail-gw0-f50.google.com (mail-gw0-f50.google.com [74.125.83.50]) by mx.google.com with ESMTPS id f68si2322593yhe.46.2011.08.10.06.09.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 06:09:22 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 74.125.83.50 as permitted sender) client-ip=74.125.83.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 74.125.83.50 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by gwj16 with SMTP id 16so701846gwj.37 for ; Wed, 10 Aug 2011 06:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=m7IiJrWAz8nj+uUiQRQvuEe8OwA2FiMH24Ow0hz/5iM=; b=UcgqYXXzFSKNc3PvAuXVIwhTubFf4YhvuSjWs7WrhHgbfWp2zFzvVSSEw6bhFKFllS Qm5jRl5oQlBDHKhSo3J2ExgQmkSSTcQy8LJUHNnnZaTbB2gKuxqsqwuL76b0XBYuPXNm k4aeFJb5wbC32S8BQt17ljGi8zJn50+5YkhP8= Received: by 10.236.175.228 with SMTP id z64mr7125108yhl.3.1312981762038; Wed, 10 Aug 2011 06:09:22 -0700 (PDT) Received: from localhost (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id f48sm1038516yhh.0.2011.08.10.06.09.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 06:09:20 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH 1/3] drm/gem: add functions for mmap offset creation Date: Wed, 10 Aug 2011 08:09:07 -0500 Message-Id: <1312981749-16106-1-git-send-email-rob@ti.com> X-Mailer: git-send-email 1.7.5.4 Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_gem.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drmP.h | 3 ++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 2b997d2..809358a 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -273,6 +273,94 @@ again: } EXPORT_SYMBOL(drm_gem_handle_create); + +/** + * drm_gem_free_mmap_offset - release a fake mmap offset for an object + * @obj: obj in question + * + * This routine frees fake offsets allocated by drm_gem_create_mmap_offset(). + */ +void +drm_gem_free_mmap_offset(struct drm_gem_object *obj) +{ + struct drm_device *dev = obj->dev; + struct drm_gem_mm *mm = dev->mm_private; + struct drm_map_list *list = &obj->map_list; + + drm_ht_remove_item(&mm->offset_hash, &list->hash); + drm_mm_put_block(list->file_offset_node); + kfree(list->map); + list->map = NULL; +} +EXPORT_SYMBOL(drm_gem_free_mmap_offset); + +/** + * drm_gem_create_mmap_offset - create a fake mmap offset for an object + * @obj: obj in question + * + * GEM memory mapping works by handing back to userspace a fake mmap offset + * it can use in a subsequent mmap(2) call. The DRM core code then looks + * up the object based on the offset and sets up the various memory mapping + * structures. + * + * This routine allocates and attaches a fake offset for @obj. + */ +int +drm_gem_create_mmap_offset(struct drm_gem_object *obj) +{ + struct drm_device *dev = obj->dev; + struct drm_gem_mm *mm = dev->mm_private; + struct drm_map_list *list; + struct drm_local_map *map; + int ret = 0; + + /* Set the object up for mmap'ing */ + list = &obj->map_list; + list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL); + if (!list->map) + return -ENOMEM; + + map = list->map; + map->type = _DRM_GEM; + map->size = obj->size; + map->handle = obj; + + /* Get a DRM GEM mmap offset allocated... */ + list->file_offset_node = drm_mm_search_free(&mm->offset_manager, + obj->size / PAGE_SIZE, 0, 0); + + if (!list->file_offset_node) { + DRM_ERROR("failed to allocate offset for bo %d\n", obj->name); + ret = -ENOSPC; + goto out_free_list; + } + + list->file_offset_node = drm_mm_get_block(list->file_offset_node, + obj->size / PAGE_SIZE, 0); + if (!list->file_offset_node) { + ret = -ENOMEM; + goto out_free_list; + } + + list->hash.key = list->file_offset_node->start; + ret = drm_ht_insert_item(&mm->offset_hash, &list->hash); + if (ret) { + DRM_ERROR("failed to add to map hash\n"); + goto out_free_mm; + } + + return 0; + +out_free_mm: + drm_mm_put_block(list->file_offset_node); +out_free_list: + kfree(list->map); + list->map = NULL; + + return ret; +} +EXPORT_SYMBOL(drm_gem_create_mmap_offset); + /** Returns a reference to the object named by the handle. */ struct drm_gem_object * drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp, diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 111e98f..ec156c3 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1622,6 +1622,9 @@ drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj) drm_gem_object_unreference_unlocked(obj); } +void drm_gem_free_mmap_offset(struct drm_gem_object *obj); +int drm_gem_create_mmap_offset(struct drm_gem_object *obj); + struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp, u32 handle);