lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 026/168] drm/etnaviv: stop abusing mmu_context as FE running marker
    Date
    From: Lucas Stach <l.stach@pengutronix.de>

    commit 23e0f5a57d0ecec86e1fc82194acd94aede21a46 upstream.

    While the DMA frontend can only be active when the MMU context is set, the
    reverse isn't necessarily true, as the frontend can be stopped while the
    MMU state is kept. Stop treating mmu_context being set as a indication that
    the frontend is running and instead add a explicit property.

    Cc: stable@vger.kernel.org # 5.4
    Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
    Tested-by: Michael Walle <michael@walle.cc>
    Tested-by: Marek Vasut <marex@denx.de>
    Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 10 ++++++++--
    drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 +
    2 files changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
    +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
    @@ -569,6 +569,8 @@ static int etnaviv_hw_reset(struct etnav
    /* We rely on the GPU running, so program the clock */
    etnaviv_gpu_update_clock(gpu);

    + gpu->fe_running = false;
    +
    return 0;
    }

    @@ -631,6 +633,8 @@ void etnaviv_gpu_start_fe(struct etnaviv
    VIVS_MMUv2_SEC_COMMAND_CONTROL_ENABLE |
    VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH(prefetch));
    }
    +
    + gpu->fe_running = true;
    }

    static void etnaviv_gpu_start_fe_idleloop(struct etnaviv_gpu *gpu)
    @@ -1364,7 +1368,7 @@ struct dma_fence *etnaviv_gpu_submit(str
    goto out_unlock;
    }

    - if (!gpu->mmu_context) {
    + if (!gpu->fe_running) {
    gpu->mmu_context = etnaviv_iommu_context_get(submit->mmu_context);
    etnaviv_gpu_start_fe_idleloop(gpu);
    } else {
    @@ -1573,7 +1577,7 @@ int etnaviv_gpu_wait_idle(struct etnaviv

    static int etnaviv_gpu_hw_suspend(struct etnaviv_gpu *gpu)
    {
    - if (gpu->initialized && gpu->mmu_context) {
    + if (gpu->initialized && gpu->fe_running) {
    /* Replace the last WAIT with END */
    mutex_lock(&gpu->lock);
    etnaviv_buffer_end(gpu);
    @@ -1588,6 +1592,8 @@ static int etnaviv_gpu_hw_suspend(struct

    etnaviv_iommu_context_put(gpu->mmu_context);
    gpu->mmu_context = NULL;
    +
    + gpu->fe_running = false;
    }

    gpu->exec_state = -1;
    --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
    +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
    @@ -101,6 +101,7 @@ struct etnaviv_gpu {
    struct workqueue_struct *wq;
    struct drm_gpu_scheduler sched;
    bool initialized;
    + bool fe_running;

    /* 'ring'-buffer: */
    struct etnaviv_cmdbuf buffer;

    \
     
     \ /
      Last update: 2021-09-20 20:42    [W:5.368 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site