drm/xe/bo: Rename xe_bo_get_sg() to xe_bo_sg()

Using "get" typically refers to obtaining a refcount, which we don't do
here so rename to xe_bo_sg().

Suggested-by: Ohad Sharabi <osharabi@habana.ai>
Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/946
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Ohad Sharabi<osharabi@habana.ai>
Link: https://patchwork.freedesktop.org/patch/msgid/20231122110359.4087-3-thomas.hellstrom@linux.intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c
index 7aad09140d7ed0a473a3b71e676413058f7f79c5..83d6a66ed3695d7a9e25e900303c7b8082b176ca 100644 (file)
--- a/drivers/gpu/drm/xe/tests/xe_migrate.c
+++ b/drivers/gpu/drm/xe/tests/xe_migrate.c
@@ -328,7 +328,7 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test)
        if (xe_bo_is_vram(pt))
                xe_res_first(pt->ttm.resource, 0, pt->size, &src_it);
        else
-               xe_res_first_sg(xe_bo_get_sg(pt), 0, pt->size, &src_it);
+               xe_res_first_sg(xe_bo_sg(pt), 0, pt->size, &src_it);
 
        emit_pte(m, bb, NUM_KERNEL_PDE - 1, xe_bo_is_vram(pt),
                 &src_it, XE_PAGE_SIZE, pt);

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index c12430cf9f2892b853ab484f5122ad13fe702b6f..4c827fd4e382d2dae8dde7fa47a03d612fb684cc 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -317,7 +317,7 @@ static int xe_tt_map_sg(struct ttm_tt *tt)
        return 0;
 }
 
-struct sg_table *xe_bo_get_sg(struct xe_bo *bo)
+struct sg_table *xe_bo_sg(struct xe_bo *bo)
 {
        struct ttm_tt *tt = bo->ttm.ttm;
        struct xe_ttm_tt *xe_tt = container_of(tt, struct xe_ttm_tt, ttm);
@@ -1735,7 +1735,7 @@ dma_addr_t __xe_bo_addr(struct xe_bo *bo, u64 offset, size_t page_size)
        if (!xe_bo_is_vram(bo) && !xe_bo_is_stolen(bo)) {
                xe_assert(xe, bo->ttm.ttm);
 
-               xe_res_first_sg(xe_bo_get_sg(bo), page << PAGE_SHIFT,
+               xe_res_first_sg(xe_bo_sg(bo), page << PAGE_SHIFT,
                                page_size, &cur);
                return xe_res_dma(&cur) + offset;
        } else {

diff --git a/drivers/gpu/drm/xe/xe_bo.h b/drivers/gpu/drm/xe/xe_bo.h
index 9d3b704a103037862abf1f8f1743cc9c3e16a454..f8bae873418ddc0842cc14885465dd870e16b7a4 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.h
+++ b/drivers/gpu/drm/xe/xe_bo.h
@@ -299,7 +299,7 @@ xe_bo_put_deferred(struct xe_bo *bo, struct llist_head *deferred)
 
 void xe_bo_put_commit(struct llist_head *deferred);
 
-struct sg_table *xe_bo_get_sg(struct xe_bo *bo);
+struct sg_table *xe_bo_sg(struct xe_bo *bo);
 
 /*
  * xe_sg_segment_size() - Provides upper limit for sg segment size.

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 53b5b36aca66416bdbf1f3b8f94ac6e5891e9a80..4aea748c984b4f0952a84c70469a3e40537b7789 100644 (file)
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -682,16 +682,16 @@ struct dma_fence *xe_migrate_copy(struct xe_migrate *m,
                return ERR_PTR(-EINVAL);
 
        if (!src_is_vram)
-               xe_res_first_sg(xe_bo_get_sg(src_bo), 0, size, &src_it);
+               xe_res_first_sg(xe_bo_sg(src_bo), 0, size, &src_it);
        else
                xe_res_first(src, 0, size, &src_it);
        if (!dst_is_vram)
-               xe_res_first_sg(xe_bo_get_sg(dst_bo), 0, size, &dst_it);
+               xe_res_first_sg(xe_bo_sg(dst_bo), 0, size, &dst_it);
        else
                xe_res_first(dst, 0, size, &dst_it);
 
        if (copy_system_ccs)
-               xe_res_first_sg(xe_bo_get_sg(src_bo), xe_bo_ccs_pages_start(src_bo),
+               xe_res_first_sg(xe_bo_sg(src_bo), xe_bo_ccs_pages_start(src_bo),
                                PAGE_ALIGN(xe_device_ccs_bytes(xe, size)),
                                &ccs_it);
 
@@ -941,7 +941,7 @@ struct dma_fence *xe_migrate_clear(struct xe_migrate *m,
        int pass = 0;
 
        if (!clear_vram)
-               xe_res_first_sg(xe_bo_get_sg(bo), 0, bo->size, &src_it);
+               xe_res_first_sg(xe_bo_sg(bo), 0, bo->size, &src_it);
        else
                xe_res_first(src, 0, bo->size, &src_it);
 

diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index 55c37f11ddb46f5b485be2a5bb9f0d3bb48f13d7..1fd461fb426e107d1043d7340d59392a52222755 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -677,7 +677,7 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma,
                        xe_res_first(bo->ttm.resource, xe_vma_bo_offset(vma),
                                     xe_vma_size(vma), &curs);
                else
-                       xe_res_first_sg(xe_bo_get_sg(bo), xe_vma_bo_offset(vma),
+                       xe_res_first_sg(xe_bo_sg(bo), xe_vma_bo_offset(vma),
                                        xe_vma_size(vma), &curs);
        } else {
                curs.size = xe_vma_size(vma);