1 files changed, 11 insertions, 17 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 250bcbce7fdc..8fb7ebf3be3e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -1635,30 +1635,25 @@ static u32 gfx_v7_0_get_rb_active_bitmap(struct amdgpu_device *adev)
 static void gfx_v7_0_setup_rb(struct amdgpu_device *adev)
 {
         int i, j;
-        u32 data, tmp, num_rbs = 0;
+        u32 data;
         u32 active_rbs = 0;
+        u32 rb_bitmap_width_per_sh = adev->gfx.config.max_backends_per_se /
+                                        adev->gfx.config.max_sh_per_se;
 
         mutex_lock(&adev->grbm_idx_mutex);
         for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {
                 for (j = 0; j < adev->gfx.config.max_sh_per_se; j++) {
                         gfx_v7_0_select_se_sh(adev, i, j);
                         data = gfx_v7_0_get_rb_active_bitmap(adev);
-                        if (adev->asic_type == CHIP_HAWAII)
-                                active_rbs |= data << ((i * adev->gfx.config.max_sh_per_se + j) *
-                                                       HAWAII_RB_BITMAP_WIDTH_PER_SH);
-                        else
-                                active_rbs |= data << ((i * adev->gfx.config.max_sh_per_se + j) *
-                                                       CIK_RB_BITMAP_WIDTH_PER_SH);
+                        active_rbs |= data << ((i * adev->gfx.config.max_sh_per_se + j) *
+                                               rb_bitmap_width_per_sh);
                 }
         }
         gfx_v7_0_select_se_sh(adev, 0xffffffff, 0xffffffff);
         mutex_unlock(&adev->grbm_idx_mutex);
 
         adev->gfx.config.backend_enable_mask = active_rbs;
-        tmp = active_rbs;
-        while (tmp >>= 1)
-                num_rbs++;
-        adev->gfx.config.num_rbs = num_rbs;
+        adev->gfx.config.num_rbs = hweight32(active_rbs);
 }
 
 /**
@@ -2046,8 +2041,7 @@ static void gfx_v7_0_ring_emit_ib_gfx(struct amdgpu_ring *ring,
         else
                 header = PACKET3(PACKET3_INDIRECT_BUFFER, 2);
 
-        control |= ib->length_dw |
-                (ib->vm ? (ib->vm->ids[ring->idx].id << 24) : 0);
+        control |= ib->length_dw | (ib->vm_id << 24);
 
         amdgpu_ring_write(ring, header);
         amdgpu_ring_write(ring,
@@ -2075,8 +2069,7 @@ static void gfx_v7_0_ring_emit_ib_compute(struct amdgpu_ring *ring,
 
         header = PACKET3(PACKET3_INDIRECT_BUFFER, 2);
 
-        control |= ib->length_dw |
-                           (ib->vm ? (ib->vm->ids[ring->idx].id << 24) : 0);
+        control |= ib->length_dw | (ib->vm_id << 24);
 
         amdgpu_ring_write(ring, header);
         amdgpu_ring_write(ring,
@@ -3825,8 +3818,7 @@ static u32 gfx_v7_0_get_cu_active_bitmap(struct amdgpu_device *adev)
         data &= CC_GC_SHADER_ARRAY_CONFIG__INACTIVE_CUS_MASK;
         data >>= CC_GC_SHADER_ARRAY_CONFIG__INACTIVE_CUS__SHIFT;
 
-        mask = gfx_v7_0_create_bitmask(adev->gfx.config.max_backends_per_se /
-                                       adev->gfx.config.max_sh_per_se);
+        mask = gfx_v7_0_create_bitmask(adev->gfx.config.max_cu_per_sh);
 
         return (~data) & mask;
 }
@@ -5237,6 +5229,8 @@ int gfx_v7_0_get_cu_info(struct amdgpu_device *adev,
         if (!adev || !cu_info)
                 return -EINVAL;
 
+        memset(cu_info, 0, sizeof(*cu_info));
+
         mutex_lock(&adev->grbm_idx_mutex);
         for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {
                 for (j = 0; j < adev->gfx.config.max_sh_per_se; j++) {