From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Dmitry Osipenko <dmitry.osipenko@collabora.com>,
Rob Clark <robdclark@chromium.org>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v3 03/10] drm/msm/gem: Convert some missed GEM_WARN_ON()s
Date: Wed, 6 Apr 2022 14:46:19 -0700 [thread overview]
Message-ID: <20220406214636.1156978-4-robdclark@gmail.com> (raw)
In-Reply-To: <20220406214636.1156978-1-robdclark@gmail.com>
From: Rob Clark <robdclark@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_gem_vma.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
index f914ddbaea89..64906594fc65 100644
--- 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);
--
2.35.1
next prev parent reply other threads:[~2022-04-06 21:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-06 21:46 [PATCH v3 00/10] drm/msm: Userspace allocated GPU addresses Rob Clark
2022-04-06 21:46 ` [PATCH v3 01/10] drm/msm/gem: Move prototypes Rob Clark
2022-04-06 21:46 ` [PATCH v3 02/10] drm/msm/gpu: Drop duplicate fence counter Rob Clark
2022-04-06 21:46 ` Rob Clark [this message]
2022-04-06 21:46 ` [PATCH v3 04/10] drm/msm/gem: Split out inuse helper Rob Clark
2022-04-06 21:46 ` [PATCH v3 05/10] drm/msm/gem: Drop PAGE_SHIFT for address space mm Rob Clark
2022-04-06 21:46 ` [PATCH v3 06/10] drm/msm: Drop msm_gem_iova() Rob Clark
2022-04-06 21:46 ` [PATCH v3 07/10] drm/msm/gem: Rework vma lookup and pin Rob Clark
2022-04-06 21:46 ` [PATCH v3 08/10] drm/msm/gem: Split " Rob Clark
2022-04-06 21:46 ` [PATCH v3 09/10] drm/msm/gem: Add fenced vma unpin Rob Clark
2022-04-06 21:46 ` [PATCH v3 10/10] drm/msm: Add a way for userspace to allocate GPU iova Rob Clark
2022-04-07 9:58 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220406214636.1156978-4-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dmitry.osipenko@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@chromium.org \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox