On Wed, Jun 22, 2016 at 8:16 AM, Christian König <deathsimple@xxxxxxxxxxx> wrote: > From: Christian König <christian.koenig@xxxxxxx> > > Now that we can pipeline evictions we need to wait for > them to finish when we cleanup a memory domain. > > Signed-off-by: Christian König <christian.koenig@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/ttm/ttm_bo.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 5d93169..e340d0d6 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -1287,6 +1287,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, > { > struct ttm_mem_type_manager *man = &bdev->man[mem_type]; > struct ttm_bo_global *glob = bdev->glob; > + struct fence *fence; > int ret; > > /* > @@ -1307,6 +1308,23 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, > spin_lock(&glob->lru_lock); > } > spin_unlock(&glob->lru_lock); > + > + spin_lock(&man->move_lock); > + fence = fence_get(man->move); > + spin_unlock(&man->move_lock); > + > + if (fence) { > + ret = fence_wait(fence, false); > + fence_put(fence); > + if (ret) { > + if (allow_errors) { > + return ret; > + } else { > + pr_err("Cleanup eviction failed\n"); > + } > + } > + } > + > return 0; > } > > -- > 2.5.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel