lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 66/88] drm/radeon: wait for moving fence after pinning
    Date
    From: Christian König <christian.koenig@amd.com>

    commit 4b41726aae563273bb4b4a9462ba51ce4d372f78 upstream.

    We actually need to wait for the moving fence after pinning
    the BO to make sure that the pin is completed.

    Signed-off-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    References: https://lore.kernel.org/dri-devel/20210621151758.2347474-1-daniel.vetter@ffwll.ch/
    CC: stable@kernel.org
    Link: https://patchwork.freedesktop.org/patch/msgid/20210622114506.106349-2-christian.koenig@amd.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/radeon/radeon_prime.c | 16 +++++++++++++---
    1 file changed, 13 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
    index 7110d403322c..c138e07f51a3 100644
    --- a/drivers/gpu/drm/radeon/radeon_prime.c
    +++ b/drivers/gpu/drm/radeon/radeon_prime.c
    @@ -92,9 +92,19 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)

    /* pin buffer into GTT */
    ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
    - if (likely(ret == 0))
    - bo->prime_shared_count++;
    -
    + if (unlikely(ret))
    + goto error;
    +
    + if (bo->tbo.moving) {
    + ret = dma_fence_wait(bo->tbo.moving, false);
    + if (unlikely(ret)) {
    + radeon_bo_unpin(bo);
    + goto error;
    + }
    + }
    +
    + bo->prime_shared_count++;
    +error:
    radeon_bo_unreserve(bo);
    return ret;
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 17:39    [W:4.039 / U:3.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site