[PATCH 1/2] drm/amdgpu: fix incorrect active RB bitmap in setup RBs

[Tim Huang]

The RB bitmap width per SA may be 0x1 for some ASICs.
Use the actual bitmap of SA instead of 0x3 to determine
the active RB bitmap.

Signed-off-by: Tim Huang <tim.hu...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 1f9279f69712..25641677cae2 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -1914,6 +1914,7 @@ static u32 gfx_v11_0_get_rb_active_bitmap(struct 
amdgpu_device *adev)
 
 static void gfx_v11_0_setup_rb(struct amdgpu_device *adev)
 {
+       u32 rb_bitmap_per_sa;
        u32 rb_bitmap_width_per_sa;
        u32 max_sa;
        u32 active_sa_bitmap;
@@ -1931,9 +1932,11 @@ static void gfx_v11_0_setup_rb(struct amdgpu_device 
*adev)
                 adev->gfx.config.max_sh_per_se;
        rb_bitmap_width_per_sa = adev->gfx.config.max_backends_per_se /
                                 adev->gfx.config.max_sh_per_se;
+       rb_bitmap_per_sa = amdgpu_gfx_create_bitmask(rb_bitmap_width_per_sa);
+
        for (i = 0; i < max_sa; i++) {
                if (active_sa_bitmap & (1 << i))
-                       active_rb_bitmap |= (0x3 << (i * 
rb_bitmap_width_per_sa));
+                       active_rb_bitmap |= (rb_bitmap_per_sa << (i * 
rb_bitmap_width_per_sa));
        }
 
        active_rb_bitmap &= global_active_rb_bitmap;
-- 
2.43.0