drm/amdgpu: fix up GDS/GWS/OA shifting

That only worked by pure coincident. Completely remove the shifting and
always apply correct PAGE_SHIFT.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index d762d78e5102..8836186eb5ef 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -721,16 +721,16 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                 e->bo_va = amdgpu_vm_bo_find(vm, ttm_to_amdgpu_bo(e->tv.bo));
 
         if (gds) {
-                p->job->gds_base = amdgpu_bo_gpu_offset(gds);
-                p->job->gds_size = amdgpu_bo_size(gds);
+                p->job->gds_base = amdgpu_bo_gpu_offset(gds) >> PAGE_SHIFT;
+                p->job->gds_size = amdgpu_bo_size(gds) >> PAGE_SHIFT;
         }
         if (gws) {
-                p->job->gws_base = amdgpu_bo_gpu_offset(gws);
-                p->job->gws_size = amdgpu_bo_size(gws);
+                p->job->gws_base = amdgpu_bo_gpu_offset(gws) >> PAGE_SHIFT;
+                p->job->gws_size = amdgpu_bo_size(gws) >> PAGE_SHIFT;
         }
         if (oa) {
-                p->job->oa_base = amdgpu_bo_gpu_offset(oa);
-                p->job->oa_size = amdgpu_bo_size(oa);
+                p->job->oa_base = amdgpu_bo_gpu_offset(oa) >> PAGE_SHIFT;
+                p->job->oa_size = amdgpu_bo_size(oa) >> PAGE_SHIFT;
         }
 
         if (!r && p->uf_entry.tv.bo) {