On Mon, Jan 6, 2025 at 1:32 AM Tim Huang <tim.huang@xxxxxxx> wrote:
>
> The RB bitmap should be global active RB bitmap &
> active RB bitmap based on active SA.
>
> Signed-off-by: Tim Huang <tim.huang@xxxxxxx>
Series is:
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> index 3aa34c55554d..f8d46651dbf5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> @@ -1650,6 +1650,7 @@ static u32 gfx_v12_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>
> static void gfx_v12_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;
> @@ -1667,12 +1668,14 @@ static void gfx_v12_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;
> + active_rb_bitmap &= global_active_rb_bitmap;
> adev->gfx.config.backend_enable_mask = active_rb_bitmap;
> adev->gfx.config.num_rbs = hweight32(active_rb_bitmap);
> }
> --
> 2.43.0
>
