lkml.org 
[lkml]   [2019]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] nouveau: factor out dmem fence completion
    Date
    Factor out the end of fencing logic from the two migration routines.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    drivers/gpu/drm/nouveau/nouveau_dmem.c | 33 ++++++++++++--------------
    1 file changed, 15 insertions(+), 18 deletions(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
    index d469bc334438..21052a4aaf69 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
    @@ -133,6 +133,19 @@ static void nouveau_dmem_page_free(struct page *page)
    spin_unlock(&chunk->lock);
    }

    +static void nouveau_dmem_fence_done(struct nouveau_fence **fence)
    +{
    + if (fence) {
    + nouveau_fence_wait(*fence, true, false);
    + nouveau_fence_unref(fence);
    + } else {
    + /*
    + * FIXME wait for channel to be IDLE before calling finalizing
    + * the hmem object.
    + */
    + }
    +}
    +
    static void
    nouveau_dmem_fault_alloc_and_copy(struct vm_area_struct *vma,
    const unsigned long *src_pfns,
    @@ -236,15 +249,7 @@ nouveau_dmem_fault_finalize_and_map(struct nouveau_dmem_fault *fault)
    {
    struct nouveau_drm *drm = fault->drm;

    - if (fault->fence) {
    - nouveau_fence_wait(fault->fence, true, false);
    - nouveau_fence_unref(&fault->fence);
    - } else {
    - /*
    - * FIXME wait for channel to be IDLE before calling finalizing
    - * the hmem object below (nouveau_migrate_hmem_fini()).
    - */
    - }
    + nouveau_dmem_fence_done(&fault->fence);

    while (fault->npages--) {
    dma_unmap_page(drm->dev->dev, fault->dma[fault->npages],
    @@ -748,15 +753,7 @@ nouveau_dmem_migrate_finalize_and_map(struct nouveau_migrate *migrate)
    {
    struct nouveau_drm *drm = migrate->drm;

    - if (migrate->fence) {
    - nouveau_fence_wait(migrate->fence, true, false);
    - nouveau_fence_unref(&migrate->fence);
    - } else {
    - /*
    - * FIXME wait for channel to be IDLE before finalizing
    - * the hmem object below (nouveau_migrate_hmem_fini()) ?
    - */
    - }
    + nouveau_dmem_fence_done(&migrate->fence);

    while (migrate->dma_nr--) {
    dma_unmap_page(drm->dev->dev, migrate->dma[migrate->dma_nr],
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-29 16:30    [W:4.235 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site