drm/nouveau: add helper functions for allocating pinned/cpu-mapped bos

Replace some awkward sequences that are repeated in a number of places
with helper functions.

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Timur Tabi <ttabi@nvidia.com>
Tested-by: Timur Tabi <ttabi@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 67146f1e8482712ba0386720960f25cfd22d3cf7..c063756eaea3cfcb215d480dab98cf96064a9687 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -768,9 +768,7 @@ static void nv_crtc_destroy(struct drm_crtc *crtc)
                disp->image[nv_crtc->index] = NULL;
        }
 
-       nouveau_bo_unmap(nv_crtc->cursor.nvbo);
-       nouveau_bo_unpin(nv_crtc->cursor.nvbo);
-       nouveau_bo_fini(nv_crtc->cursor.nvbo);
+       nouveau_bo_unpin_del(&nv_crtc->cursor.nvbo);
        nvif_event_dtor(&nv_crtc->vblank);
        nvif_head_dtor(&nv_crtc->head);
        kfree(nv_crtc);
@@ -1303,6 +1301,7 @@ nv04_crtc_vblank_handler(struct nvif_event *event, void *repv, u32 repc)
 int
 nv04_crtc_create(struct drm_device *dev, int crtc_num)
 {
+       struct nouveau_cli *cli = &nouveau_drm(dev)->client;
        struct nouveau_display *disp = nouveau_display(dev);
        struct nouveau_crtc *nv_crtc;
        struct drm_plane *primary;
@@ -1336,20 +1335,9 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num)
        drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
        drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
 
-       ret = nouveau_bo_new(&nouveau_drm(dev)->client, 64*64*4, 0x100,
-                            NOUVEAU_GEM_DOMAIN_VRAM, 0, 0x0000, NULL, NULL,
-                            &nv_crtc->cursor.nvbo);
-       if (!ret) {
-               ret = nouveau_bo_pin(nv_crtc->cursor.nvbo,
-                                    NOUVEAU_GEM_DOMAIN_VRAM, false);
-               if (!ret) {
-                       ret = nouveau_bo_map(nv_crtc->cursor.nvbo);
-                       if (ret)
-                               nouveau_bo_unpin(nv_crtc->cursor.nvbo);
-               }
-               if (ret)
-                       nouveau_bo_fini(nv_crtc->cursor.nvbo);
-       }
+       ret = nouveau_bo_new_map(cli, NOUVEAU_GEM_DOMAIN_VRAM, 64 * 64 * 4, &nv_crtc->cursor.nvbo);
+       if (ret)
+               return ret;
 
        nv04_cursor_init(nv_crtc);
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 9bed728cb00e4a588ccc3a9003531e3081ea3968..10485510b5394c029d880e43c64cd85b63582cb3 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -2808,10 +2808,7 @@ nv50_display_destroy(struct drm_device *dev)
        nvif_object_dtor(&disp->caps);
        nv50_core_del(&disp->core);
 
-       nouveau_bo_unmap(disp->sync);
-       if (disp->sync)
-               nouveau_bo_unpin(disp->sync);
-       nouveau_bo_fini(disp->sync);
+       nouveau_bo_unpin_del(&disp->sync);
 
        nouveau_display(dev)->priv = NULL;
        kfree(disp);
@@ -2843,20 +2840,7 @@ nv50_display_create(struct drm_device *dev)
        dev->mode_config.normalize_zpos = true;
 
        /* small shared memory area we use for notifiers and semaphores */
-       ret = nouveau_bo_new(&drm->client, 4096, 0x1000,
-                            NOUVEAU_GEM_DOMAIN_VRAM,
-                            0, 0x0000, NULL, NULL, &disp->sync);
-       if (!ret) {
-               ret = nouveau_bo_pin(disp->sync, NOUVEAU_GEM_DOMAIN_VRAM, true);
-               if (!ret) {
-                       ret = nouveau_bo_map(disp->sync);
-                       if (ret)
-                               nouveau_bo_unpin(disp->sync);
-               }
-               if (ret)
-                       nouveau_bo_fini(disp->sync);
-       }
-
+       ret = nouveau_bo_new_map(&drm->client, NOUVEAU_GEM_DOMAIN_VRAM, PAGE_SIZE, &disp->sync);
        if (ret)
                goto out;
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index fbe0144927e8f6f7c78179a399ac7f25480b550d..3a5ddf60380edfdedc79d672068a07102f602504 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -401,6 +401,61 @@ nouveau_bo_new(struct nouveau_cli *cli, u64 size, int align,
        return 0;
 }
 
+void
+nouveau_bo_unpin_del(struct nouveau_bo **pnvbo)
+{
+       struct nouveau_bo *nvbo = *pnvbo;
+
+       if (!nvbo)
+               return;
+
+       nouveau_bo_unmap(nvbo);
+       nouveau_bo_unpin(nvbo);
+       nouveau_bo_fini(nvbo);
+
+       *pnvbo = NULL;
+}
+
+int
+nouveau_bo_new_pin(struct nouveau_cli *cli, u32 domain, u32 size, struct nouveau_bo **pnvbo)
+{
+       struct nouveau_bo *nvbo;
+       int ret;
+
+       ret = nouveau_bo_new(cli, size, 0, domain, 0, 0, NULL, NULL, &nvbo);
+       if (ret)
+               return ret;
+
+       ret = nouveau_bo_pin(nvbo, domain, false);
+       if (ret) {
+               nouveau_bo_fini(nvbo);
+               return ret;
+       }
+
+       *pnvbo = nvbo;
+       return 0;
+}
+
+int
+nouveau_bo_new_map(struct nouveau_cli *cli, u32 domain, u32 size, struct nouveau_bo **pnvbo)
+{
+       struct nouveau_bo *nvbo;
+       int ret;
+
+       ret = nouveau_bo_new_pin(cli, domain, size, &nvbo);
+       if (ret)
+               return ret;
+
+       ret = nouveau_bo_map(nvbo);
+       if (ret) {
+               nouveau_bo_unpin_del(&nvbo);
+               return ret;
+       }
+
+       *pnvbo = nvbo;
+       return 0;
+}
+
 static void
 set_placement_range(struct nouveau_bo *nvbo, uint32_t domain)
 {

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h b/drivers/gpu/drm/nouveau/nouveau_bo.h
index 596a63a50a20602c431cec6b0a8d191e91b852b8..f402f14bebb06830a1fbfa26e9b8432888ddcbef 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.h
@@ -9,6 +9,7 @@ struct nouveau_channel;
 struct nouveau_cli;
 struct nouveau_drm;
 struct nouveau_fence;
+struct nouveau_vma;
 
 struct nouveau_bo {
        struct ttm_buffer_object bo;
@@ -89,6 +90,10 @@ void nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo);
 void nouveau_bo_add_io_reserve_lru(struct ttm_buffer_object *bo);
 void nouveau_bo_del_io_reserve_lru(struct ttm_buffer_object *bo);
 
+int nouveau_bo_new_pin(struct nouveau_cli *, u32 domain, u32 size, struct nouveau_bo **);
+int nouveau_bo_new_map(struct nouveau_cli *, u32 domain, u32 size, struct nouveau_bo **);
+void nouveau_bo_unpin_del(struct nouveau_bo **);
+
 /* TODO: submit equivalent to TTM generic API upstream? */
 static inline void __iomem *
 nvbo_kmap_obj_iovirtual(struct nouveau_bo *nvbo)

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index a14aa6715bb94302411a84284a81a69d77c0b967..4b4bbbd8d7b7a331a6a19261fae038856ade5863 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -105,10 +105,7 @@ nouveau_channel_del(struct nouveau_channel **pchan)
                nvif_mem_dtor(&chan->mem_userd);
                nvif_object_dtor(&chan->push.ctxdma);
                nouveau_vma_del(&chan->push.vma);
-               nouveau_bo_unmap(chan->push.buffer);
-               if (chan->push.buffer && chan->push.buffer->bo.pin_count)
-                       nouveau_bo_unpin(chan->push.buffer);
-               nouveau_bo_fini(chan->push.buffer);
+               nouveau_bo_unpin_del(&chan->push.buffer);
                kfree(chan);
        }
        *pchan = NULL;
@@ -163,14 +160,7 @@ nouveau_channel_prep(struct nouveau_cli *cli,
        if (nouveau_vram_pushbuf)
                target = NOUVEAU_GEM_DOMAIN_VRAM;
 
-       ret = nouveau_bo_new(cli, size, 0, target, 0, 0, NULL, NULL,
-                           &chan->push.buffer);
-       if (ret == 0) {
-               ret = nouveau_bo_pin(chan->push.buffer, target, false);
-               if (ret == 0)
-                       ret = nouveau_bo_map(chan->push.buffer);
-       }
-
+       ret = nouveau_bo_new_map(cli, target, size, &chan->push.buffer);
        if (ret) {
                nouveau_channel_del(pchan);
                return ret;

diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index 61d0f411ef841ae4976ff164ccf5d087c7fd2463..ca4932a150e3875fba41af2d3832e07cc9f816c2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -256,20 +256,15 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage)
        chunk->pagemap.ops = &nouveau_dmem_pagemap_ops;
        chunk->pagemap.owner = drm->dev;
 
-       ret = nouveau_bo_new(&drm->client, DMEM_CHUNK_SIZE, 0,
-                            NOUVEAU_GEM_DOMAIN_VRAM, 0, 0, NULL, NULL,
-                            &chunk->bo);
+       ret = nouveau_bo_new_pin(&drm->client, NOUVEAU_GEM_DOMAIN_VRAM, DMEM_CHUNK_SIZE,
+                                &chunk->bo);
        if (ret)
                goto out_release;
 
-       ret = nouveau_bo_pin(chunk->bo, NOUVEAU_GEM_DOMAIN_VRAM, false);
-       if (ret)
-               goto out_bo_free;
-
        ptr = memremap_pages(&chunk->pagemap, numa_node_id());
        if (IS_ERR(ptr)) {
                ret = PTR_ERR(ptr);
-               goto out_bo_unpin;
+               goto out_bo_free;
        }
 
        mutex_lock(&drm->dmem->mutex);
@@ -292,10 +287,8 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage)
 
        return 0;
 
-out_bo_unpin:
-       nouveau_bo_unpin(chunk->bo);
 out_bo_free:
-       nouveau_bo_fini(chunk->bo);
+       nouveau_bo_unpin_del(&chunk->bo);
 out_release:
        release_mem_region(chunk->pagemap.range.start, range_len(&chunk->pagemap.range));
 out_free:
@@ -426,8 +419,7 @@ nouveau_dmem_fini(struct nouveau_drm *drm)
 
        list_for_each_entry_safe(chunk, tmp, &drm->dmem->chunks, list) {
                nouveau_dmem_evict_chunk(chunk);
-               nouveau_bo_unpin(chunk->bo);
-               nouveau_bo_fini(chunk->bo);
+               nouveau_bo_unpin_del(&chunk->bo);
                WARN_ON(chunk->callocated);
                list_del(&chunk->list);
                memunmap_pages(&chunk->pagemap);

diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c
index 8c73f40e3bda2e5de662cc55ccad0f67a5cfd5e5..40ee9534081434b3f702fe4c76052ea362b6bb54 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/drivers/gpu/drm/nouveau/nv10_fence.c
@@ -85,10 +85,8 @@ void
 nv10_fence_destroy(struct nouveau_drm *drm)
 {
        struct nv10_fence_priv *priv = drm->fence;
-       nouveau_bo_unmap(priv->bo);
-       if (priv->bo)
-               nouveau_bo_unpin(priv->bo);
-       nouveau_bo_fini(priv->bo);
+
+       nouveau_bo_unpin_del(&priv->bo);
        drm->fence = NULL;
        kfree(priv);
 }

diff --git a/drivers/gpu/drm/nouveau/nv17_fence.c b/drivers/gpu/drm/nouveau/nv17_fence.c
index d09bfd11369f06da0942befcf85a58f7f3ae0f52..1b0c0aa3c3058943fc9e9600aa66f8e32a3686f5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv17_fence.c
+++ b/drivers/gpu/drm/nouveau/nv17_fence.c
@@ -130,20 +130,7 @@ nv17_fence_create(struct nouveau_drm *drm)
        priv->base.context_del = nv10_fence_context_del;
        spin_lock_init(&priv->lock);
 
-       ret = nouveau_bo_new(&drm->client, 4096, 0x1000,
-                            NOUVEAU_GEM_DOMAIN_VRAM,
-                            0, 0x0000, NULL, NULL, &priv->bo);
-       if (!ret) {
-               ret = nouveau_bo_pin(priv->bo, NOUVEAU_GEM_DOMAIN_VRAM, false);
-               if (!ret) {
-                       ret = nouveau_bo_map(priv->bo);
-                       if (ret)
-                               nouveau_bo_unpin(priv->bo);
-               }
-               if (ret)
-                       nouveau_bo_fini(priv->bo);
-       }
-
+       ret = nouveau_bo_new_map(&drm->client, NOUVEAU_GEM_DOMAIN_VRAM, PAGE_SIZE, &priv->bo);
        if (ret) {
                nv10_fence_destroy(drm);
                return ret;

diff --git a/drivers/gpu/drm/nouveau/nv50_fence.c b/drivers/gpu/drm/nouveau/nv50_fence.c
index 62e28dddf87c1719d8f6f13a0f1fb63b7c461900..e1f0e8adf313961a1ab71483e9594aa401246a0e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_fence.c
+++ b/drivers/gpu/drm/nouveau/nv50_fence.c
@@ -81,20 +81,7 @@ nv50_fence_create(struct nouveau_drm *drm)
        priv->base.context_del = nv10_fence_context_del;
        spin_lock_init(&priv->lock);
 
-       ret = nouveau_bo_new(&drm->client, 4096, 0x1000,
-                            NOUVEAU_GEM_DOMAIN_VRAM,
-                            0, 0x0000, NULL, NULL, &priv->bo);
-       if (!ret) {
-               ret = nouveau_bo_pin(priv->bo, NOUVEAU_GEM_DOMAIN_VRAM, false);
-               if (!ret) {
-                       ret = nouveau_bo_map(priv->bo);
-                       if (ret)
-                               nouveau_bo_unpin(priv->bo);
-               }
-               if (ret)
-                       nouveau_bo_fini(priv->bo);
-       }
-
+       ret = nouveau_bo_new_map(&drm->client, NOUVEAU_GEM_DOMAIN_VRAM, PAGE_SIZE, &priv->bo);
        if (ret) {
                nv10_fence_destroy(drm);
                return ret;

diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index aa7dd0c5d917bb50a70a115ede0a2b1d45a3b65b..1765b2cedaf9d6b40c0dc0e75b54dfefbd57b6b4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@ -185,10 +185,8 @@ static void
 nv84_fence_destroy(struct nouveau_drm *drm)
 {
        struct nv84_fence_priv *priv = drm->fence;
-       nouveau_bo_unmap(priv->bo);
-       if (priv->bo)
-               nouveau_bo_unpin(priv->bo);
-       nouveau_bo_fini(priv->bo);
+
+       nouveau_bo_unpin_del(&priv->bo);
        drm->fence = NULL;
        kfree(priv);
 }
@@ -222,19 +220,8 @@ nv84_fence_create(struct nouveau_drm *drm)
                  * will lose CPU/GPU coherency!
                  */
                NOUVEAU_GEM_DOMAIN_GART | NOUVEAU_GEM_DOMAIN_COHERENT;
-       ret = nouveau_bo_new(&drm->client, 16 * drm->chan_total, 0,
-                            domain, 0, 0, NULL, NULL, &priv->bo);
-       if (ret == 0) {
-               ret = nouveau_bo_pin(priv->bo, domain, false);
-               if (ret == 0) {
-                       ret = nouveau_bo_map(priv->bo);
-                       if (ret)
-                               nouveau_bo_unpin(priv->bo);
-               }
-               if (ret)
-                       nouveau_bo_fini(priv->bo);
-       }
 
+       ret = nouveau_bo_new_map(&drm->client, domain, 16 * drm->chan_total, &priv->bo);
        if (ret)
                nv84_fence_destroy(drm);
        return ret;