[Nouveau] [PATCH 5/6] drm/ttm: Change the meaning of the fields in the drm_mm_nodes structure from pfn to bytes

[Somalapuram Amaranath]

Change the ttm_range_man_alloc() allocation from pages to size in bytes.
Fix the dependent drm_mm_nodes start and size from pages to bytes.

Signed-off-by: Somalapuram Amaranath <amaranath.somalapu...@amd.com>
---
 drivers/gpu/drm/i915/i915_scatterlist.c |  6 +++---
 drivers/gpu/drm/ttm/ttm_range_manager.c | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_scatterlist.c 
b/drivers/gpu/drm/i915/i915_scatterlist.c
index 756289e43dff..7defda1219d0 100644
--- a/drivers/gpu/drm/i915/i915_scatterlist.c
+++ b/drivers/gpu/drm/i915/i915_scatterlist.c
@@ -94,7 +94,7 @@ struct i915_refct_sgt *i915_rsgt_from_mm_node(const struct 
drm_mm_node *node,
        if (!rsgt)
                return ERR_PTR(-ENOMEM);
 
-       i915_refct_sgt_init(rsgt, node->size << PAGE_SHIFT);
+       i915_refct_sgt_init(rsgt, node->size);
        st = &rsgt->table;
        /* restricted by sg_alloc_table */
        if (WARN_ON(overflows_type(DIV_ROUND_UP_ULL(node->size, segment_pages),
@@ -110,8 +110,8 @@ struct i915_refct_sgt *i915_rsgt_from_mm_node(const struct 
drm_mm_node *node,
        sg = st->sgl;
        st->nents = 0;
        prev_end = (resource_size_t)-1;
-       block_size = node->size << PAGE_SHIFT;
-       offset = node->start << PAGE_SHIFT;
+       block_size = node->size;
+       offset = node->start;
 
        while (block_size) {
                u64 len;
diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c 
b/drivers/gpu/drm/ttm/ttm_range_manager.c
index 62fddcc59f02..ff9962f7f81d 100644
--- a/drivers/gpu/drm/ttm/ttm_range_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_range_manager.c
@@ -83,9 +83,10 @@ static int ttm_range_man_alloc(struct ttm_resource_manager 
*man,
 
        spin_lock(&rman->lock);
        ret = drm_mm_insert_node_in_range(mm, &node->mm_nodes[0],
-                                         PFN_UP(node->base.size),
-                                         bo->page_alignment, 0,
-                                         place->fpfn, lpfn, mode);
+                                         node->base.size,
+                                         bo->page_alignment << PAGE_SHIFT, 0,
+                                         place->fpfn << PAGE_SHIFT,
+                                         lpfn << PAGE_SHIFT, mode);
        spin_unlock(&rman->lock);
 
        if (unlikely(ret)) {
@@ -119,11 +120,10 @@ static bool ttm_range_man_intersects(struct 
ttm_resource_manager *man,
                                     size_t size)
 {
        struct drm_mm_node *node = &to_ttm_range_mgr_node(res)->mm_nodes[0];
-       u32 num_pages = PFN_UP(size);
 
        /* Don't evict BOs outside of the requested placement range */
-       if (place->fpfn >= (node->start + num_pages) ||
-           (place->lpfn && place->lpfn <= node->start))
+       if ((place->fpfn << PAGE_SHIFT) >= (node->start + size) ||
+           (place->lpfn && (place->lpfn << PAGE_SHIFT) <= node->start))
                return false;
 
        return true;
@@ -135,10 +135,9 @@ static bool ttm_range_man_compatible(struct 
ttm_resource_manager *man,
                                     size_t size)
 {
        struct drm_mm_node *node = &to_ttm_range_mgr_node(res)->mm_nodes[0];
-       u32 num_pages = PFN_UP(size);
 
        if (node->start < place->fpfn ||
-           (place->lpfn && (node->start + num_pages) > place->lpfn))
+           (place->lpfn && (node->start + size) > place->lpfn << PAGE_SHIFT))
                return false;
 
        return true;
-- 
2.32.0