| Message ID | 20200917043040.146575-5-airlied@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/ttm: bind/unbind + cleanups | expand |
Am 17.09.20 um 06:30 schrieb Dave Airlie: > From: Dave Airlie <airlied@redhat.com> > > Now the bind functions have all the protection explicitly the > drivers can just call them directly, and the api can be unexported > > Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++++- > drivers/gpu/drm/nouveau/nouveau_bo.c | 5 ++++- > drivers/gpu/drm/radeon/radeon_ttm.c | 6 +++++- > drivers/gpu/drm/ttm/ttm_bo.c | 1 - > 4 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 2028b9e4c25c..a57aaf666340 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -63,6 +63,10 @@ > > #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128 > > +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, > + struct ttm_tt *ttm, > + struct ttm_resource *bo_mem); > + > static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, > unsigned int type, > uint64_t size) > @@ -552,7 +556,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, > goto out_cleanup; > > /* Bind the memory to the GTT space */ > - r = ttm_bo_tt_bind(bo, &tmp_mem); > + r = amdgpu_ttm_backend_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 4a020a3da3dd..56f974c28eb5 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -44,6 +44,9 @@ > #include <nvif/if500b.h> > #include <nvif/if900b.h> > > +static int nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, > + struct ttm_resource *reg); > + > /* > * NV10-NV40 tiling helpers > */ > @@ -927,7 +930,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, > if (ret) > goto out; > > - ret = ttm_bo_tt_bind(bo, &tmp_reg); > + ret = nouveau_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 03e5ae4e3bf6..99d9ca1087b7 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -56,6 +56,10 @@ > static int radeon_ttm_debugfs_init(struct radeon_device *rdev); > static void radeon_ttm_debugfs_fini(struct radeon_device *rdev); > > +static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev, > + struct ttm_tt *ttm, > + struct ttm_resource *bo_mem); > + > struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev) > { > struct radeon_mman *mman; > @@ -238,7 +242,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, > goto out_cleanup; > } > > - r = ttm_bo_tt_bind(bo, &tmp_mem); > + r = radeon_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 2c527cd20dfa..279a0e44a5ed 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -1628,7 +1628,6 @@ int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem) > { > return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem); > } > -EXPORT_SYMBOL(ttm_bo_tt_bind); > > void ttm_bo_tt_unbind(struct ttm_buffer_object *bo) > {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 2028b9e4c25c..a57aaf666340 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -63,6 +63,10 @@ #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, + struct ttm_tt *ttm, + struct ttm_resource *bo_mem); + static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, unsigned int type, uint64_t size) @@ -552,7 +556,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, goto out_cleanup; /* Bind the memory to the GTT space */ - r = ttm_bo_tt_bind(bo, &tmp_mem); + r = amdgpu_ttm_backend_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 4a020a3da3dd..56f974c28eb5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -44,6 +44,9 @@ #include <nvif/if500b.h> #include <nvif/if900b.h> +static int nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, + struct ttm_resource *reg); + /* * NV10-NV40 tiling helpers */ @@ -927,7 +930,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, if (ret) goto out; - ret = ttm_bo_tt_bind(bo, &tmp_reg); + ret = nouveau_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 03e5ae4e3bf6..99d9ca1087b7 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -56,6 +56,10 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev); static void radeon_ttm_debugfs_fini(struct radeon_device *rdev); +static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev, + struct ttm_tt *ttm, + struct ttm_resource *bo_mem); + struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev) { struct radeon_mman *mman; @@ -238,7 +242,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, goto out_cleanup; } - r = ttm_bo_tt_bind(bo, &tmp_mem); + r = radeon_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 2c527cd20dfa..279a0e44a5ed 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1628,7 +1628,6 @@ int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem) { return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem); } -EXPORT_SYMBOL(ttm_bo_tt_bind); void ttm_bo_tt_unbind(struct ttm_buffer_object *bo) {