[Nouveau] [PATCH 6/6] drm/amdgpu: Cleanup the GDS, GWS and OA allocations

[Somalapuram Amaranath]

Change the size of GDS, GWS and OA from pages to bytes.
The initialized gds_size, gws_size and oa_size in bytes,
remove PAGE_SHIFT in 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    |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index c3d9d75143f4..4641b25956fd 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 f5d5eee09cea..9285037d6d88 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 f0dabdfd3780..a8e444a31d8f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -77,8 +77,7 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
                                    unsigned int type,
                                    uint64_t size)
 {
-       return ttm_range_man_init(&adev->mman.bdev, type,
-                                 false, size << PAGE_SHIFT);
+       return ttm_range_man_init(&adev->mman.bdev, type, false, size);
 }
 
 /**
-- 
2.32.0