From patchwork Thu Aug 4 17:07:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 3276 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 C03F624070 for ; Thu, 4 Aug 2011 17:07:54 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 8F96AA18505 for ; Thu, 4 Aug 2011 17:07:54 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so1170327qwb.11 for ; Thu, 04 Aug 2011 10:07:54 -0700 (PDT) Received: by 10.224.192.135 with SMTP id dq7mr748819qab.169.1312477674387; Thu, 04 Aug 2011 10:07:54 -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.6.73 with SMTP id 9cs21060qcy; Thu, 4 Aug 2011 10:07:54 -0700 (PDT) Received: by 10.227.132.66 with SMTP id a2mr952587wbt.81.1312477673524; Thu, 04 Aug 2011 10:07:53 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id p2si4281203wbh.34.2011.08.04.10.07.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Aug 2011 10:07:53 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 74.125.82.178 as permitted sender) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 74.125.82.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by mail-wy0-f178.google.com with SMTP id 19so1757047wyf.37 for ; Thu, 04 Aug 2011 10:07:53 -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:in-reply-to :references; bh=tDAjaGkQw765p/K4dXT9jy4P5aT1c/TXMtCeMkQLoVk=; b=Ui22dWCLrkwVmJHZhdJLRb+ypLVppJYm0tsY8Khz3t0ese48tDtEveRH/O0GZmvh7+ biqZGKcgfUXsY8OidwZSG6pJq4MfyR+FEVcfACYM3nKRKK+3ZZgDZ7CskSC7tTJL2mCc NFKCjLfgd81a3sfftLe1XdPLjBEFDrUMzOLQU= Received: by 10.216.133.194 with SMTP id q44mr961914wei.56.1312477673132; Thu, 04 Aug 2011 10:07:53 -0700 (PDT) Received: from localhost ([109.234.204.184]) by mx.google.com with ESMTPS id n6sm1311755wed.40.2011.08.04.10.07.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Aug 2011 10:07:52 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH 3/9] drm/gma500: use common functions for mmap offset creation Date: Thu, 4 Aug 2011 12:07:40 -0500 Message-Id: <1312477672-32366-3-git-send-email-rob@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: --- drivers/staging/gma500/psb_gem.c | 63 +------------------------------------ 1 files changed, 2 insertions(+), 61 deletions(-) Signed-off-by: to progress upstream of course diff --git a/drivers/staging/gma500/psb_gem.c b/drivers/staging/gma500/psb_gem.c index 76ff7ba..3a397f5 100644 --- a/drivers/staging/gma500/psb_gem.c +++ b/drivers/staging/gma500/psb_gem.c @@ -42,13 +42,7 @@ void psb_gem_free_object(struct drm_gem_object *obj) struct gtt_range *gtt = container_of(obj, struct gtt_range, gem); psb_gtt_free_range(obj->dev, gtt); if (obj->map_list.map) { - /* Do things GEM should do for us */ - struct drm_gem_mm *mm = obj->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; + drm_gem_free_mmap_offset(obj); } drm_gem_object_release(obj); } @@ -60,59 +54,6 @@ int psb_gem_get_aperture(struct drm_device *dev, void *data, } /** - * psb_gem_create_mmap_offset - invent an mmap offset - * @obj: our object - * - * This is basically doing by hand a pile of ugly crap which should - * be done automatically by the GEM library code but isn't - */ -static int psb_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; - - list = &obj->map_list; - list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL); - if (list->map == NULL) - return -ENOMEM; - map = list->map; - map->type = _DRM_GEM; - map->size = obj->size; - map->handle =obj; - - 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 free_it; - } - 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 free_it; - } - 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 free_mm; - } - return 0; - -free_mm: - drm_mm_put_block(list->file_offset_node); -free_it: - kfree(list->map); - list->map = NULL; - return ret; -} - -/** * psb_gem_dumb_map_gtt - buffer mapping for dumb interface * @file: our drm client file * @dev: drm device @@ -142,7 +83,7 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, /* Make it mmapable */ if (!obj->map_list.map) { - ret = psb_gem_create_mmap_offset(obj); + ret = drm_gem_create_mmap_offset(obj); if (ret) goto out; }