ttm: split populate out from binding.

Christian König Tue, 15 Sep 2020 00:50:42 -0700

Am 15.09.20 um 04:40 schrieb Dave Airlie:

From: Dave Airlie <airl...@redhat.com>


Drivers have to call populate themselves now before binding.

Signed-off-by: Dave Airlie <airl...@redhat.com>
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c |  7 ++++++-
  drivers/gpu/drm/nouveau/nouveau_bo.c    |  6 +++++-
  drivers/gpu/drm/radeon/radeon_ttm.c     |  7 ++++++-
  drivers/gpu/drm/ttm/ttm_bo.c            |  6 +++++-
  drivers/gpu/drm/ttm/ttm_bo_util.c       |  7 ++++++-
  drivers/gpu/drm/ttm/ttm_tt.c            | 11 +++++------
  include/drm/ttm/ttm_tt.h                |  3 +--
  7 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 568cb75900a3..dc73cce515b2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -548,8 +548,13 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object 
*bo, bool evict,
                goto out_cleanup;
        }

+ r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);

+       if (unlikely(r)) {
+               goto out_cleanup;
+       }

Nit pick, don't use {} here. Apart from that the patch is Reviewed-by:Christian König <christian.koe...@amd.com>

+
        /* Bind the memory to the GTT space */
-       r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem, ctx);
+       r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
        if (unlikely(r)) {
                goto out_cleanup;
        }
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c 
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 3ab9397fac40..3a1032d01808 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -904,7 +904,11 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool 
evict, bool intr,
        if (ret)
                return ret;

- ret = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg, &ctx);

+       ret = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
+       if (ret)
+               goto out;
+
+       ret = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
        if (ret)
                goto out;

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c

index 7aa3d03ddeb9..2bc6991fb7e9 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -237,7 +237,12 @@ static int radeon_move_vram_ram(struct ttm_buffer_object 
*bo,
                goto out_cleanup;
        }

- r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem, &ctx);

+       r = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
+       if (unlikely(r)) {
+               goto out_cleanup;
+       }
+
+       r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
        if (unlikely(r)) {
                goto out_cleanup;
        }
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 9aae9e1bd8e8..32eaf809b7c9 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -260,7 +260,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object 
*bo,
                        goto out_err;

if (mem->mem_type != TTM_PL_SYSTEM) {

-                       ret = ttm_tt_bind(bdev, bo->ttm, mem, ctx);
+                       ret = ttm_tt_populate(bdev, bo->ttm, ctx);
+                       if (ret)
+                               goto out_err;
+
+                       ret = ttm_tt_bind(bdev, bo->ttm, mem);
                        if (ret)
                                goto out_err;
                }
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c 
b/drivers/gpu/drm/ttm/ttm_bo_util.c
index f3452a1624fd..2354046bda9a 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -77,7 +77,12 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
                return ret;

if (new_mem->mem_type != TTM_PL_SYSTEM) {

-               ret = ttm_tt_bind(bo->bdev, ttm, new_mem, ctx);
+
+               ret = ttm_tt_populate(bo->bdev, ttm, ctx);
+               if (unlikely(ret != 0))
+                       return ret;
+
+               ret = ttm_tt_bind(bo->bdev, ttm, new_mem);
                if (unlikely(ret != 0))
                        return ret;
        }
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 381face3cedb..93d65e5e4205 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -312,8 +312,7 @@ void ttm_tt_unbind(struct ttm_bo_device *bdev, struct 
ttm_tt *ttm)
  }

int ttm_tt_bind(struct ttm_bo_device *bdev,

-               struct ttm_tt *ttm, struct ttm_resource *bo_mem,
-               struct ttm_operation_ctx *ctx)
+               struct ttm_tt *ttm, struct ttm_resource *bo_mem)
  {
        int ret = 0;

@@ -323,10 +322,6 @@ int ttm_tt_bind(struct ttm_bo_device *bdev,

        if (ttm_tt_is_bound(ttm))
                return 0;

- ret = ttm_tt_populate(bdev, ttm, ctx);

-       if (ret)
-               return ret;
-
        ret = bdev->driver->ttm_tt_bind(bdev, ttm, bo_mem);
        if (unlikely(ret != 0))
                return ret;
@@ -455,6 +450,9 @@ int ttm_tt_populate(struct ttm_bo_device *bdev,
  {
        int ret;

+ if (!ttm)

+               return -EINVAL;
+
        if (ttm_tt_is_populated(ttm))
                return 0;

@@ -466,6 +464,7 @@ int ttm_tt_populate(struct ttm_bo_device *bdev,

                ttm_tt_add_mapping(bdev, ttm);
        return ret;
  }
+EXPORT_SYMBOL(ttm_tt_populate);

static void ttm_tt_clear_mapping(struct ttm_tt *ttm)

  {
diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h
index 86ae759ff018..8f57d86ee67b 100644
--- a/include/drm/ttm/ttm_tt.h
+++ b/include/drm/ttm/ttm_tt.h
@@ -173,8 +173,7 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);
   * Bind the pages of @ttm to an aperture location identified by @bo_mem
   */
  int ttm_tt_bind(struct ttm_bo_device *bdev,
-               struct ttm_tt *ttm, struct ttm_resource *bo_mem,
-               struct ttm_operation_ctx *ctx);
+               struct ttm_tt *ttm, struct ttm_resource *bo_mem);

/**

   * ttm_ttm_destroy:


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 4/7] drm/ttm: split populate out from binding.

Reply via email to