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, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index dc4b2f34e3ea..a64056dadc58 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -528,13 +528,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                 struct drm_amdgpu_info_gds gds_info;
 
                 memset(&gds_info, 0, sizeof(gds_info));
-                gds_info.gds_gfx_partition_size = adev->gds.mem.gfx_partition_size >> AMDGPU_GDS_SHIFT;
-                gds_info.compute_partition_size = adev->gds.mem.cs_partition_size >> AMDGPU_GDS_SHIFT;
-                gds_info.gds_total_size = adev->gds.mem.total_size >> AMDGPU_GDS_SHIFT;
-                gds_info.gws_per_gfx_partition = adev->gds.gws.gfx_partition_size >> AMDGPU_GWS_SHIFT;
-                gds_info.gws_per_compute_partition = adev->gds.gws.cs_partition_size >> AMDGPU_GWS_SHIFT;
-                gds_info.oa_per_gfx_partition = adev->gds.oa.gfx_partition_size >> AMDGPU_OA_SHIFT;
-                gds_info.oa_per_compute_partition = adev->gds.oa.cs_partition_size >> AMDGPU_OA_SHIFT;
+                gds_info.gds_gfx_partition_size = adev->gds.mem.gfx_partition_size;
+                gds_info.compute_partition_size = adev->gds.mem.cs_partition_size;
+                gds_info.gds_total_size = adev->gds.mem.total_size;
+                gds_info.gws_per_gfx_partition = adev->gds.gws.gfx_partition_size;
+                gds_info.gws_per_compute_partition = adev->gds.gws.cs_partition_size;
+                gds_info.oa_per_gfx_partition = adev->gds.oa.gfx_partition_size;
+                gds_info.oa_per_compute_partition = adev->gds.oa.cs_partition_size;
                 return copy_to_user(out, &gds_info,
                                     min((size_t)size, sizeof(gds_info))) ? -EFAULT : 0;
         }