Skip to content
Snippets Groups Projects
Commit 8e30fa32 authored by Rob Clark's avatar Rob Clark :speech_balloon:
Browse files
parent f9d5355f
No related branches found
No related tags found
Loading
...@@ -44,7 +44,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, ...@@ -44,7 +44,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
unsigned size = vma->node.size << PAGE_SHIFT; unsigned size = vma->node.size << PAGE_SHIFT;
/* Print a message if we try to purge a vma in use */ /* Print a message if we try to purge a vma in use */
if (WARN_ON(vma->inuse > 0)) if (GEM_WARN_ON(vma->inuse > 0))
return; return;
/* Don't do anything if the memory isn't mapped */ /* Don't do anything if the memory isn't mapped */
...@@ -61,7 +61,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, ...@@ -61,7 +61,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,
struct msm_gem_vma *vma) struct msm_gem_vma *vma)
{ {
if (!WARN_ON(!vma->iova)) if (!GEM_WARN_ON(!vma->iova))
vma->inuse--; vma->inuse--;
} }
...@@ -73,7 +73,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, ...@@ -73,7 +73,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace,
unsigned size = npages << PAGE_SHIFT; unsigned size = npages << PAGE_SHIFT;
int ret = 0; int ret = 0;
if (WARN_ON(!vma->iova)) if (GEM_WARN_ON(!vma->iova))
return -EINVAL; return -EINVAL;
/* Increase the usage counter */ /* Increase the usage counter */
...@@ -100,7 +100,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, ...@@ -100,7 +100,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace,
void msm_gem_close_vma(struct msm_gem_address_space *aspace, void msm_gem_close_vma(struct msm_gem_address_space *aspace,
struct msm_gem_vma *vma) struct msm_gem_vma *vma)
{ {
if (WARN_ON(vma->inuse > 0 || vma->mapped)) if (GEM_WARN_ON(vma->inuse > 0 || vma->mapped))
return; return;
spin_lock(&aspace->lock); spin_lock(&aspace->lock);
...@@ -120,7 +120,7 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace, ...@@ -120,7 +120,7 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace,
{ {
int ret; int ret;
if (WARN_ON(vma->iova)) if (GEM_WARN_ON(vma->iova))
return -EBUSY; return -EBUSY;
spin_lock(&aspace->lock); spin_lock(&aspace->lock);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment