video: tegra: nvmap: Use nvmap.h include file from kernel/include
[linux-2.6.git] / drivers / video / tegra / nvmap / nvmap_dev.c
index d30100d..c788187 100644 (file)
@@ -3,7 +3,7 @@
  *
  * User-space interface to nvmap
  *
- * Copyright (c) 2011, NVIDIA Corporation.
+ * Copyright (c) 2011-2012, NVIDIA Corporation.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@
 #include <asm/tlbflush.h>
 
 #include <mach/iovmm.h>
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
 
 #include "nvmap.h"
 #include "nvmap_ioctl.h"
@@ -61,7 +61,7 @@ struct nvmap_carveout_node {
        struct nvmap_heap       *carveout;
        int                     index;
        struct list_head        clients;
-       spinlock_t              clients_lock;
+       spinlock_t              clients_lock;
 };
 
 struct nvmap_device {
@@ -287,7 +287,7 @@ int nvmap_flush_heap_block(struct nvmap_client *client,
        if (prot == NVMAP_HANDLE_UNCACHEABLE || prot == NVMAP_HANDLE_WRITE_COMBINE)
                goto out;
 
-       if ( len >= FLUSH_CLEAN_BY_SET_WAY_THRESHOLD ) {
+       if (len >= FLUSH_CLEAN_BY_SET_WAY_THRESHOLD) {
                inner_flush_cache_all();
                if (prot != NVMAP_HANDLE_INNER_CACHEABLE)
                        outer_flush_range(block->base, block->base + len);
@@ -315,7 +315,7 @@ int nvmap_flush_heap_block(struct nvmap_client *client,
        if (prot != NVMAP_HANDLE_INNER_CACHEABLE)
                outer_flush_range(block->base, block->base + len);
 
-       nvmap_free_pte((client ? client->dev: nvmap_dev), pte);
+       nvmap_free_pte((client ? client->dev : nvmap_dev), pte);
 out:
        wmb();
        return 0;
@@ -353,15 +353,15 @@ void nvmap_carveout_commit_subtract(struct nvmap_client *client,
                return;
 
        spin_lock_irqsave(&node->clients_lock, flags);
+       BUG_ON(client->carveout_commit[node->index].commit < len);
        client->carveout_commit[node->index].commit -= len;
-       BUG_ON(client->carveout_commit[node->index].commit < 0);
        /* if no more allocation in this carveout for this node, delete it */
        if (!client->carveout_commit[node->index].commit)
                list_del_init(&client->carveout_commit[node->index].list);
        spin_unlock_irqrestore(&node->clients_lock, flags);
 }
 
-static struct nvmap_client* get_client_from_carveout_commit(
+static struct nvmap_client *get_client_from_carveout_commit(
        struct nvmap_carveout_node *node, struct nvmap_carveout_commit *commit)
 {
        struct nvmap_carveout_commit *first_commit = commit - node->index;
@@ -680,7 +680,7 @@ static void destroy_client(struct nvmap_client *client)
                pins = atomic_read(&ref->pin);
 
                if (ref->handle->owner == client)
-                   ref->handle->owner = NULL;
+                       ref->handle->owner = NULL;
 
                while (pins--)
                        nvmap_unpin_handles(client, &ref->handle, 1);
@@ -983,12 +983,12 @@ static void allocations_stringify(struct nvmap_client *client,
                        rb_entry(n, struct nvmap_handle_ref, node);
                struct nvmap_handle *handle = ref->handle;
                if (handle->alloc && !handle->heap_pgalloc) {
-                       seq_printf(s, "%-18s %-18s %8lx %10u\n", "", "",
+                       seq_printf(s, "%-18s %-18s %8lx %10u %8x\n", "", "",
                                        (unsigned long)(handle->carveout->base),
-                                       handle->size);
+                                       handle->size, handle->userflags);
                } else if (handle->alloc && handle->heap_pgalloc) {
-                       seq_printf(s, "%-18s %-18s %8lx %10u\n", "", "",
-                                       base, handle->size);
+                       seq_printf(s, "%-18s %-18s %8lx %10u %8x\n", "", "",
+                                       base, handle->size, handle->userflags);
                }
        }
 }
@@ -1001,8 +1001,8 @@ static int nvmap_debug_allocations_show(struct seq_file *s, void *unused)
        unsigned int total = 0;
 
        spin_lock_irqsave(&node->clients_lock, flags);
-       seq_printf(s, "%-18s %18s %8s %10s\n", "CLIENT", "PROCESS", "PID",
-               "SIZE");
+       seq_printf(s, "%-18s %18s %8s %10s %8s\n", "CLIENT", "PROCESS", "PID",
+               "SIZE", "FLAGS");
        seq_printf(s, "%-18s %18s %8s %10s\n", "", "",
                                        "BASE", "SIZE");
        list_for_each_entry(commit, &node->clients, list) {
@@ -1026,7 +1026,7 @@ static int nvmap_debug_allocations_open(struct inode *inode, struct file *file)
                           inode->i_private);
 }
 
-static struct file_operations debug_allocations_fops = {
+static const struct file_operations debug_allocations_fops = {
        .open = nvmap_debug_allocations_open,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -1061,7 +1061,7 @@ static int nvmap_debug_clients_open(struct inode *inode, struct file *file)
        return single_open(file, nvmap_debug_clients_show, inode->i_private);
 }
 
-static struct file_operations debug_clients_fops = {
+static const struct file_operations debug_clients_fops = {
        .open = nvmap_debug_clients_open,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -1182,14 +1182,21 @@ static int nvmap_probe(struct platform_device *pdev)
 
        init_waitqueue_head(&dev->iovmm_master.pin_wait);
        mutex_init(&dev->iovmm_master.pin_lock);
+#ifdef CONFIG_NVMAP_PAGE_POOLS
+       for (i = 0; i < NVMAP_NUM_POOLS; i++)
+               nvmap_page_pool_init(&dev->iovmm_master.pools[i], i);
+#endif
+
        dev->iovmm_master.iovmm =
                tegra_iovmm_alloc_client(dev_name(&pdev->dev), NULL,
                        &(dev->dev_user));
-       if (IS_ERR(dev->iovmm_master.iovmm)) {
+#ifdef CONFIG_TEGRA_IOVMM
+       if (!dev->iovmm_master.iovmm) {
                e = PTR_ERR(dev->iovmm_master.iovmm);
                dev_err(&pdev->dev, "couldn't create iovmm client\n");
                goto fail;
        }
+#endif
        dev->vm_rgn = alloc_vm_area(NVMAP_NUM_PTES * PAGE_SIZE);
        if (!dev->vm_rgn) {
                e = -ENOMEM;
@@ -1263,7 +1270,7 @@ static int nvmap_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "couldn't create debug files\n");
 
        for (i = 0; i < plat->nr_carveouts; i++) {
-               struct nvmap_carveout_node *node = &dev->heaps[i];
+               struct nvmap_carveout_node *node = &dev->heaps[dev->nr_carveouts];
                const struct nvmap_platform_carveout *co = &plat->carveouts[i];
                if (!co->size)
                        continue;
@@ -1275,9 +1282,9 @@ static int nvmap_probe(struct platform_device *pdev)
                        dev_err(&pdev->dev, "couldn't create %s\n", co->name);
                        goto fail_heaps;
                }
+               node->index = dev->nr_carveouts;
                dev->nr_carveouts++;
                spin_lock_init(&node->clients_lock);
-               node->index = i;
                INIT_LIST_HEAD(&node->clients);
                node->heap_bit = co->usage_mask;
                if (nvmap_heap_create_group(node->carveout,
@@ -1306,19 +1313,24 @@ static int nvmap_probe(struct platform_device *pdev)
                                dev, &debug_iovmm_clients_fops);
                        debugfs_create_file("allocations", 0664, iovmm_root,
                                dev, &debug_iovmm_allocations_fops);
+#ifdef CONFIG_NVMAP_PAGE_POOLS
+                       for (i = 0; i < NVMAP_NUM_POOLS; i++) {
+                               char name[40];
+                               char *memtype_string[] = {"uc", "wc",
+                                                         "iwb", "wb"};
+                               sprintf(name, "%s_page_pool_available_pages",
+                                       memtype_string[i]);
+                               debugfs_create_u32(name, S_IRUGO|S_IWUSR,
+                                       iovmm_root,
+                                       &dev->iovmm_master.pools[i].npages);
+                       }
+#endif
                }
        }
 
        platform_set_drvdata(pdev, dev);
        nvmap_dev = dev;
 
-#if defined(CONFIG_TEGRA_AVP_KERNEL_ON_SMMU)
-       {
-               void avp_early_init(void);
-               avp_early_init();
-       }
-#endif
-
        return 0;
 fail_heaps:
        for (i = 0; i < dev->nr_carveouts; i++) {