lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 042/135] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context
    Date
    From: Boris Brezillon <boris.brezillon@collabora.com>

    commit dde2bb2da01e96c17f0a44b4a3cf72a30e66e3ef upstream.

    We need to use the AS attached to the opened FD when dumping counters.

    Reported-by: Antonio Caggiano <antonio.caggiano@collabora.com>
    Fixes: 7282f7645d06 ("drm/panfrost: Implement per FD address spaces")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
    Reviewed-by: Steven Price <steven.price@arm.com>
    Tested-by: Antonio Caggiano <antonio.caggiano@collabora.com>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200206141327.446127-1-boris.brezillon@collabora.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/panfrost/panfrost_mmu.c | 7 ++++++-
    drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 ++++-------
    2 files changed, 10 insertions(+), 8 deletions(-)

    --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
    +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
    @@ -151,7 +151,12 @@ u32 panfrost_mmu_as_get(struct panfrost_
    as = mmu->as;
    if (as >= 0) {
    int en = atomic_inc_return(&mmu->as_count);
    - WARN_ON(en >= NUM_JOB_SLOTS);
    +
    + /*
    + * AS can be retained by active jobs or a perfcnt context,
    + * hence the '+ 1' here.
    + */
    + WARN_ON(en >= (NUM_JOB_SLOTS + 1));

    list_move(&mmu->list, &pfdev->as_lru_list);
    goto out;
    --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
    +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
    @@ -73,7 +73,7 @@ static int panfrost_perfcnt_enable_locke
    struct panfrost_file_priv *user = file_priv->driver_priv;
    struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;
    struct drm_gem_shmem_object *bo;
    - u32 cfg;
    + u32 cfg, as;
    int ret;

    if (user == perfcnt->user)
    @@ -126,12 +126,8 @@ static int panfrost_perfcnt_enable_locke

    perfcnt->user = user;

    - /*
    - * Always use address space 0 for now.
    - * FIXME: this needs to be updated when we start using different
    - * address space.
    - */
    - cfg = GPU_PERFCNT_CFG_AS(0) |
    + as = panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu);
    + cfg = GPU_PERFCNT_CFG_AS(as) |
    GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL);

    /*
    @@ -195,6 +191,7 @@ static int panfrost_perfcnt_disable_lock
    drm_gem_shmem_vunmap(&perfcnt->mapping->obj->base.base, perfcnt->buf);
    perfcnt->buf = NULL;
    panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
    + panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);
    panfrost_gem_mapping_put(perfcnt->mapping);
    perfcnt->mapping = NULL;
    pm_runtime_mark_last_busy(pfdev->dev);

    \
     
     \ /
      Last update: 2020-02-27 15:08    [W:4.685 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site