On Wed, 30 Mar 2022 at 02:00, Rob Clark <robdclark@xxxxxxxxx> wrote:
>
> From: Rob Clark <robdclark@xxxxxxxxxxxx>
>
> There was only a single user, which could just as easily stash the iova
> when pinning.
>
> Signed-off-by: Rob Clark <robdclark@xxxxxxxxxxxx>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/msm_fb.c | 16 ++++++++++------
> drivers/gpu/drm/msm/msm_gem.c | 16 ----------------
> drivers/gpu/drm/msm/msm_gem.h | 2 --
> 3 files changed, 10 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
> index 7137492fe78e..d4eef66e29dc 100644
> --- a/drivers/gpu/drm/msm/msm_fb.c
> +++ b/drivers/gpu/drm/msm/msm_fb.c
> @@ -21,6 +21,9 @@ struct msm_framebuffer {
>
> /* Count of # of attached planes which need dirtyfb: */
> refcount_t dirtyfb;
> +
> + /* Framebuffer per-plane address, if pinned, else zero: */
> + uint64_t iova[DRM_FORMAT_MAX_PLANES];
> };
> #define to_msm_framebuffer(x) container_of(x, struct msm_framebuffer, base)
>
> @@ -76,14 +79,14 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb,
> {
> struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
> int ret, i, n = fb->format->num_planes;
> - uint64_t iova;
>
> if (needs_dirtyfb)
> refcount_inc(&msm_fb->dirtyfb);
>
> for (i = 0; i < n; i++) {
> - ret = msm_gem_get_and_pin_iova(fb->obj[i], aspace, &iova);
> - drm_dbg_state(fb->dev, "FB[%u]: iova[%d]: %08llx (%d)", fb->base.id, i, iova, ret);
> + ret = msm_gem_get_and_pin_iova(fb->obj[i], aspace, &msm_fb->iova[i]);
> + drm_dbg_state(fb->dev, "FB[%u]: iova[%d]: %08llx (%d)",
> + fb->base.id, i, msm_fb->iova[i], ret);
> if (ret)
> return ret;
> }
> @@ -103,14 +106,15 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb,
>
> for (i = 0; i < n; i++)
> msm_gem_unpin_iova(fb->obj[i], aspace);
> +
> + memset(msm_fb->iova, 0, sizeof(msm_fb->iova));
> }
>
> uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb,
> struct msm_gem_address_space *aspace, int plane)
> {
> - if (!fb->obj[plane])
> - return 0;
> - return msm_gem_iova(fb->obj[plane], aspace) + fb->offsets[plane];
> + struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
> + return msm_fb->iova[plane];
> }
>
> struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int plane)
> diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
> index f4b68bb28a4d..deafae6feaa8 100644
> --- a/drivers/gpu/drm/msm/msm_gem.c
> +++ b/drivers/gpu/drm/msm/msm_gem.c
> @@ -509,22 +509,6 @@ int msm_gem_get_iova(struct drm_gem_object *obj,
> return ret;
> }
>
> -/* get iova without taking a reference, used in places where you have
> - * already done a 'msm_gem_get_and_pin_iova' or 'msm_gem_get_iova'
> - */
> -uint64_t msm_gem_iova(struct drm_gem_object *obj,
> - struct msm_gem_address_space *aspace)
> -{
> - struct msm_gem_vma *vma;
> -
> - msm_gem_lock(obj);
> - vma = lookup_vma(obj, aspace);
> - msm_gem_unlock(obj);
> - GEM_WARN_ON(!vma);
> -
> - return vma ? vma->iova : 0;
> -}
> -
> /*
> * Locked variant of msm_gem_unpin_iova()
> */
> diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
> index 090c3b1a6d9a..772de010a669 100644
> --- a/drivers/gpu/drm/msm/msm_gem.h
> +++ b/drivers/gpu/drm/msm/msm_gem.h
> @@ -142,8 +142,6 @@ int msm_gem_get_and_pin_iova_locked(struct drm_gem_object *obj,
> struct msm_gem_address_space *aspace, uint64_t *iova);
> int msm_gem_get_and_pin_iova(struct drm_gem_object *obj,
> struct msm_gem_address_space *aspace, uint64_t *iova);
> -uint64_t msm_gem_iova(struct drm_gem_object *obj,
> - struct msm_gem_address_space *aspace);
> void msm_gem_unpin_iova_locked(struct drm_gem_object *obj,
> struct msm_gem_address_space *aspace);
> void msm_gem_unpin_iova(struct drm_gem_object *obj,
> --
> 2.35.1
>
--
With best wishes
Dmitry
