lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 066/102] drm/amdgpu: fix amdgpu_sync_resv v2
    Date
    From: Christian König <christian.koenig@amd.com>

    [ Upstream commit d4b7648d6d1774f961f3f6a758d9b009f1f34f05 ]

    Fixes a bug introduced by AMDGPU_GEM_CREATE_EXPLICIT_SYNC. We still need
    to wait for pipelined moves in the shared fences list.

    v2: fix typo

    Signed-off-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Andres Rodriguez <andresx7@gmail.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
    index a4bf21f8f1c1..bbbc40d630a0 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
    @@ -191,9 +191,6 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
    f = reservation_object_get_excl(resv);
    r = amdgpu_sync_fence(adev, sync, f);

    - if (explicit_sync)
    - return r;
    -
    flist = reservation_object_get_list(resv);
    if (!flist || r)
    return r;
    @@ -212,11 +209,11 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
    (fence_owner == AMDGPU_FENCE_OWNER_VM)))
    continue;

    - /* Ignore fence from the same owner as
    + /* Ignore fence from the same owner and explicit one as
    * long as it isn't undefined.
    */
    if (owner != AMDGPU_FENCE_OWNER_UNDEFINED &&
    - fence_owner == owner)
    + (fence_owner == owner || explicit_sync))
    continue;
    }

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 01:38    [W:5.099 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site