[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <a3c87373-1b7e-7b30-3b03-7a87f517b7b3@linaro.org>
Date: Fri, 15 Apr 2022 00:23:15 +0300
From: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
To: Rob Clark <robdclark@...il.com>, dri-devel@...ts.freedesktop.org
Cc: linux-arm-msm@...r.kernel.org, freedreno@...ts.freedesktop.org,
Dmitry Osipenko <dmitry.osipenko@...labora.com>,
Rob Clark <robdclark@...omium.org>,
Sean Paul <sean@...rly.run>,
Abhinav Kumar <quic_abhinavk@...cinc.com>,
David Airlie <airlied@...ux.ie>,
Daniel Vetter <daniel@...ll.ch>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v4 04/10] drm/msm/gem: Split out inuse helper
On 12/04/2022 00:58, Rob Clark wrote:
> From: Rob Clark <robdclark@...omium.org>
>
> Prep for a following patch, where it gets a bit more complicated.
>
> Signed-off-by: Rob Clark <robdclark@...omium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
> ---
> drivers/gpu/drm/msm/msm_gem.c | 2 +-
> drivers/gpu/drm/msm/msm_gem.h | 1 +
> drivers/gpu/drm/msm/msm_gem_vma.c | 9 +++++++--
> 3 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
> index a4f61972667b..f96d1dc72021 100644
> --- a/drivers/gpu/drm/msm/msm_gem.c
> +++ b/drivers/gpu/drm/msm/msm_gem.c
> @@ -938,7 +938,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,
> name, comm ? ":" : "", comm ? comm : "",
> vma->aspace, vma->iova,
> vma->mapped ? "mapped" : "unmapped",
> - vma->inuse);
> + msm_gem_vma_inuse(vma));
> kfree(comm);
> }
>
> diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
> index 947ff7d9b471..1b7f0f0b88bf 100644
> --- a/drivers/gpu/drm/msm/msm_gem.h
> +++ b/drivers/gpu/drm/msm/msm_gem.h
> @@ -61,6 +61,7 @@ struct msm_gem_vma {
> int msm_gem_init_vma(struct msm_gem_address_space *aspace,
> struct msm_gem_vma *vma, int npages,
> u64 range_start, u64 range_end);
> +bool msm_gem_vma_inuse(struct msm_gem_vma *vma);
> void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
> struct msm_gem_vma *vma);
> void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,
> diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
> index 64906594fc65..dc2ae097805e 100644
> --- a/drivers/gpu/drm/msm/msm_gem_vma.c
> +++ b/drivers/gpu/drm/msm/msm_gem_vma.c
> @@ -37,6 +37,11 @@ msm_gem_address_space_get(struct msm_gem_address_space *aspace)
> return aspace;
> }
>
> +bool msm_gem_vma_inuse(struct msm_gem_vma *vma)
> +{
> + return !!vma->inuse;
> +}
> +
> /* Actually unmap memory for the vma */
> void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
> struct msm_gem_vma *vma)
> @@ -44,7 +49,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 (GEM_WARN_ON(vma->inuse > 0))
> + if (GEM_WARN_ON(msm_gem_vma_inuse(vma)))
> return;
>
> /* Don't do anything if the memory isn't mapped */
> @@ -100,7 +105,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 (GEM_WARN_ON(vma->inuse > 0 || vma->mapped))
> + if (GEM_WARN_ON(msm_gem_vma_inuse(vma) || vma->mapped))
> return;
>
> spin_lock(&aspace->lock);
--
With best wishes
Dmitry
Powered by blists - more mailing lists