drm/ttm: flush the fence on the bo after we individualize the reservation object
authorxinhui pan <xinhui.pan@amd.com>
Wed, 15 Jan 2020 06:07:45 +0000 (14:07 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Apr 2020 08:36:27 +0000 (10:36 +0200)
[ Upstream commit 1bbcf69e42fe7fd49b6f4339c970729d0e343753 ]

As we move the ttm_bo_individualize_resv() upwards, we need flush the
copied fence too. Otherwise the driver keeps waiting for fence.

run&Kill kfdtest, then perf top.

  25.53%  [ttm]                     [k] ttm_bo_delayed_delete
  24.29%  [kernel]                  [k] dma_resv_test_signaled_rcu
  19.72%  [kernel]                  [k] ww_mutex_lock

Fix: 378e2d5b("drm/ttm: fix ttm_bo_cleanup_refs_or_queue once more")
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/series/72339/
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/ttm/ttm_bo.c

index f078036..abf165b 100644 (file)
@@ -517,8 +517,10 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)
 
                dma_resv_unlock(bo->base.resv);
        }
-       if (bo->base.resv != &bo->base._resv)
+       if (bo->base.resv != &bo->base._resv) {
+               ttm_bo_flush_all_fences(bo);
                dma_resv_unlock(&bo->base._resv);
+       }
 
 error:
        kref_get(&bo->list_kref);