summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/video/tegra/nvmap/nvmap.c4
-rw-r--r--drivers/video/tegra/nvmap/nvmap.h8
-rw-r--r--drivers/video/tegra/nvmap/nvmap_dev.c4
-rw-r--r--drivers/video/tegra/nvmap/nvmap_handle.c12
-rw-r--r--drivers/video/tegra/nvmap/nvmap_heap.c18
-rwxr-xr-xdrivers/video/tegra/nvmap/nvmap_ioctl.c12
6 files changed, 26 insertions, 32 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c
index 46d3386059b6..00b9a5adb49f 100644
--- a/drivers/video/tegra/nvmap/nvmap.c
+++ b/drivers/video/tegra/nvmap/nvmap.c
@@ -579,9 +579,9 @@ unsigned long nvmap_handle_address(struct nvmap_client *c, unsigned long id)
h = nvmap_get_handle_id(c, id);
if (!h)
return -EPERM;
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
phys = handle_phys(h);
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
nvmap_handle_put(h);
return phys;
diff --git a/drivers/video/tegra/nvmap/nvmap.h b/drivers/video/tegra/nvmap/nvmap.h
index 0d1e1eec48b5..923ff8fc8d8a 100644
--- a/drivers/video/tegra/nvmap/nvmap.h
+++ b/drivers/video/tegra/nvmap/nvmap.h
@@ -81,7 +81,7 @@ struct nvmap_handle {
bool secure; /* zap IOVMM area on unpin */
bool heap_pgalloc; /* handle is page allocated (sysmem / iovmm) */
bool alloc; /* handle has memory allocated */
- spinlock_t lock;
+ struct mutex lock;
};
struct nvmap_share {
@@ -107,7 +107,7 @@ struct nvmap_client {
struct rb_root handle_refs;
atomic_t iovm_commit;
size_t iovm_limit;
- spinlock_t ref_lock;
+ struct mutex ref_lock;
bool super;
atomic_t count;
struct task_struct *task;
@@ -133,12 +133,12 @@ struct nvmap_vma_priv {
static inline void nvmap_ref_lock(struct nvmap_client *priv)
{
- spin_lock(&priv->ref_lock);
+ mutex_lock(&priv->ref_lock);
}
static inline void nvmap_ref_unlock(struct nvmap_client *priv)
{
- spin_unlock(&priv->ref_lock);
+ mutex_unlock(&priv->ref_lock);
}
struct device *nvmap_client_to_device(struct nvmap_client *client);
diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c
index 780fadc02743..ed97228d0d63 100644
--- a/drivers/video/tegra/nvmap/nvmap_dev.c
+++ b/drivers/video/tegra/nvmap/nvmap_dev.c
@@ -626,7 +626,7 @@ struct nvmap_client *nvmap_create_client(struct nvmap_device *dev,
task_unlock(current->group_leader);
client->task = task;
- spin_lock_init(&client->ref_lock);
+ mutex_init(&client->ref_lock);
atomic_set(&client->count, 1);
return client;
@@ -651,10 +651,8 @@ static void destroy_client(struct nvmap_client *client)
smp_rmb();
pins = atomic_read(&ref->pin);
- spin_lock(&ref->handle->lock);
if (ref->handle->owner == client)
ref->handle->owner = NULL;
- spin_unlock(&ref->handle->lock);
while (pins--)
nvmap_unpin_handles(client, &ref->handle, 1);
diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index c8a2c1fc9c79..dc3be30ca2f5 100644
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -371,11 +371,11 @@ void nvmap_free_handle_id(struct nvmap_client *client, unsigned long id)
atomic_sub(h->size, &client->iovm_commit);
if (h->alloc && !h->heap_pgalloc) {
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
nvmap_carveout_commit_subtract(client,
nvmap_heap_to_arg(nvmap_block_to_heap(h->carveout)),
h->size);
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
}
nvmap_ref_unlock(client);
@@ -387,10 +387,8 @@ void nvmap_free_handle_id(struct nvmap_client *client, unsigned long id)
while (pins--)
nvmap_unpin_handles(client, &ref->handle, 1);
- spin_lock(&h->lock);
if (h->owner == client)
h->owner = NULL;
- spin_unlock(&h->lock);
kfree(ref);
@@ -446,7 +444,7 @@ struct nvmap_handle_ref *nvmap_create_handle(struct nvmap_client *client,
BUG_ON(!h->owner);
h->size = h->orig_size = size;
h->flags = NVMAP_HANDLE_WRITE_COMBINE;
- spin_lock_init(&h->lock);
+ mutex_init(&h->lock);
nvmap_handle_add(client->dev, h);
@@ -516,11 +514,11 @@ struct nvmap_handle_ref *nvmap_duplicate_handle_id(struct nvmap_client *client,
}
if (!h->heap_pgalloc) {
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
nvmap_carveout_commit_add(client,
nvmap_heap_to_arg(nvmap_block_to_heap(h->carveout)),
h->size);
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
}
atomic_set(&ref->dupes, 1);
diff --git a/drivers/video/tegra/nvmap/nvmap_heap.c b/drivers/video/tegra/nvmap/nvmap_heap.c
index 0d7e1cd31bb8..c920048db82b 100644
--- a/drivers/video/tegra/nvmap/nvmap_heap.c
+++ b/drivers/video/tegra/nvmap/nvmap_heap.c
@@ -696,24 +696,22 @@ static struct nvmap_heap_block *do_heap_relocate_listblock(
size_t src_align = block->align;
unsigned int src_prot = block->mem_prot;
int error = 0;
+ struct nvmap_share *share;
if (!handle) {
pr_err("INVALID HANDLE!\n");
return NULL;
}
- spin_lock(&handle->lock);
+ mutex_lock(&handle->lock);
- if (!handle->owner) {
- spin_unlock(&handle->lock);
- return NULL;
- }
+ share = nvmap_get_share_from_dev(handle->dev);
/* TODO: It is possible to use only handle lock and no share
* pin_lock, but then we'll need to lock every handle during
* each pinning operation. Need to estimate performance impact
* if we decide to simplify locking this way. */
- mutex_lock(&handle->owner->share->pin_lock);
+ mutex_lock(&share->pin_lock);
/* abort if block is pinned */
if (atomic_read(&handle->pin))
@@ -755,8 +753,8 @@ static struct nvmap_heap_block *do_heap_relocate_listblock(
BUG_ON(error);
fail:
- mutex_unlock(&handle->owner->share->pin_lock);
- spin_unlock(&handle->lock);
+ mutex_unlock(&share->pin_lock);
+ mutex_unlock(&handle->lock);
return heap_block_new;
}
@@ -829,9 +827,9 @@ static void nvmap_heap_compact(struct nvmap_heap *heap,
void nvmap_usecount_inc(struct nvmap_handle *h)
{
if (h->alloc && !h->heap_pgalloc) {
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
h->usecount++;
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
} else {
h->usecount++;
}
diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c
index 051794708109..886f0ee252ad 100755
--- a/drivers/video/tegra/nvmap/nvmap_ioctl.c
+++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c
@@ -321,7 +321,7 @@ int nvmap_ioctl_get_param(struct file *filp, void __user* arg)
op.result = h->orig_size;
break;
case NVMAP_HANDLE_PARAM_ALIGNMENT:
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
if (!h->alloc)
op.result = 0;
else if (h->heap_pgalloc)
@@ -330,15 +330,15 @@ int nvmap_ioctl_get_param(struct file *filp, void __user* arg)
op.result = (h->carveout->base & -h->carveout->base);
else
op.result = SZ_4M;
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
break;
case NVMAP_HANDLE_PARAM_BASE:
if (WARN_ON(!h->alloc || !atomic_add_return(0, &h->pin)))
op.result = -1ul;
else if (!h->heap_pgalloc) {
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
op.result = h->carveout->base;
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
}
else if (h->pgalloc.contig)
op.result = page_to_phys(h->pgalloc.pages[0]);
@@ -351,9 +351,9 @@ int nvmap_ioctl_get_param(struct file *filp, void __user* arg)
if (!h->alloc)
op.result = 0;
else if (!h->heap_pgalloc) {
- spin_lock(&h->lock);
+ mutex_lock(&h->lock);
op.result = nvmap_carveout_usage(client, h->carveout);
- spin_unlock(&h->lock);
+ mutex_unlock(&h->lock);
}
else if (h->pgalloc.contig)
op.result = NVMAP_HEAP_SYSMEM;
generated by cgit v1.2.3 (git 2.0.4) at 2024-07-07 09:42:57 +0000