[PATCH v4 3/4] drm/amdgpu: GDS/GWS/OA cleanup the page shift operation

[Somalapuram Amaranath]

Remove page shift operations as ttm_resource moved
from num_pages to size_t size in bytes.
v1 – v4: adding missing related to amdgpu_ttm_init_on_chip

Signed-off-by: Somalapuram Amaranath <amaranath.somalapu...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c    | 12 ++++++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  3 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 9e549923622b..2732d89c8468 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -142,16 +142,16 @@ void amdgpu_job_set_resources(struct amdgpu_job *job, 
struct amdgpu_bo *gds,
                              struct amdgpu_bo *gws, struct amdgpu_bo *oa)
 {
        if (gds) {
-               job->gds_base = amdgpu_bo_gpu_offset(gds) >> PAGE_SHIFT;
-               job->gds_size = amdgpu_bo_size(gds) >> PAGE_SHIFT;
+               job->gds_base = amdgpu_bo_gpu_offset(gds);
+               job->gds_size = amdgpu_bo_size(gds);
        }
        if (gws) {
-               job->gws_base = amdgpu_bo_gpu_offset(gws) >> PAGE_SHIFT;
-               job->gws_size = amdgpu_bo_size(gws) >> PAGE_SHIFT;
+               job->gws_base = amdgpu_bo_gpu_offset(gws);
+               job->gws_size = amdgpu_bo_size(gws);
        }
        if (oa) {
-               job->oa_base = amdgpu_bo_gpu_offset(oa) >> PAGE_SHIFT;
-               job->oa_size = amdgpu_bo_size(oa) >> PAGE_SHIFT;
+               job->oa_base = amdgpu_bo_gpu_offset(oa);
+               job->oa_size = amdgpu_bo_size(oa);
        }
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 2ab67ab204df..bbd0a4550fbf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -541,12 +541,11 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
        if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {
                /* GWS and OA don't need any alignment. */
                page_align = bp->byte_align;
-               size <<= PAGE_SHIFT;
 
        } else if (bp->domain & AMDGPU_GEM_DOMAIN_GDS) {
                /* Both size and alignment must be a multiple of 4. */
                page_align = ALIGN(bp->byte_align, 4);
-               size = ALIGN(size, 4) << PAGE_SHIFT;
+               size = ALIGN(size, 4);
        } else {
                /* Memory should be aligned at least to a page size. */
                page_align = ALIGN(bp->byte_align, PAGE_SIZE) >> PAGE_SHIFT;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ffe6a1ab7f9a..c1500875b4ad 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1849,19 +1849,19 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
        }
 
        /* Initialize various on-chip memory pools */
-       r = amdgpu_ttm_init_on_chip(adev, AMDGPU_PL_GDS, adev->gds.gds_size);
+       r = amdgpu_ttm_init_on_chip(adev, AMDGPU_PL_GDS, adev->gds.gds_size << 
PAGE_SHIFT);
        if (r) {
                DRM_ERROR("Failed initializing GDS heap.\n");
                return r;
        }
 
-       r = amdgpu_ttm_init_on_chip(adev, AMDGPU_PL_GWS, adev->gds.gws_size);
+       r = amdgpu_ttm_init_on_chip(adev, AMDGPU_PL_GWS, adev->gds.gws_size << 
PAGE_SHIFT);
        if (r) {
                DRM_ERROR("Failed initializing gws heap.\n");
                return r;
        }
 
-       r = amdgpu_ttm_init_on_chip(adev, AMDGPU_PL_OA, adev->gds.oa_size);
+       r = amdgpu_ttm_init_on_chip(adev, AMDGPU_PL_OA, adev->gds.oa_size << 
PAGE_SHIFT);
        if (r) {
                DRM_ERROR("Failed initializing oa heap.\n");
                return r;
-- 
2.32.0