drm/msm/gem: Convert some missed GEM_WARN_ON()s

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220411215849.297838-4-robdclark@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
index f914ddb..6490659 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_vma.c
+++ b/drivers/gpu/drm/msm/msm_gem_vma.c
@@ -44,7 +44,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
        unsigned size = vma->node.size << PAGE_SHIFT;
 
        /* 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;
 
        /* 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,
 void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,
                struct msm_gem_vma *vma)
 {
-       if (!WARN_ON(!vma->iova))
+       if (!GEM_WARN_ON(!vma->iova))
                vma->inuse--;
 }
 
@@ -73,7 +73,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace,
        unsigned size = npages << PAGE_SHIFT;
        int ret = 0;
 
-       if (WARN_ON(!vma->iova))
+       if (GEM_WARN_ON(!vma->iova))
                return -EINVAL;
 
        /* Increase the usage counter */
@@ -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,
                struct msm_gem_vma *vma)
 {
-       if (WARN_ON(vma->inuse > 0 || vma->mapped))
+       if (GEM_WARN_ON(vma->inuse > 0 || vma->mapped))
                return;
 
        spin_lock(&aspace->lock);
@@ -120,7 +120,7 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace,
 {
        int ret;
 
-       if (WARN_ON(vma->iova))
+       if (GEM_WARN_ON(vma->iova))
                return -EBUSY;
 
        spin_lock(&aspace->lock);