Commit 4a60c55b authored by Tim Huang's avatar Tim Huang Committed by Alex Deucher
Browse files

drm/amdgpu: fix incorrect active RB bitmap in setup RBs 



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: default avatarTim Huang <tim.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 62498e79

drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c

+4 −1
Original line number Diff line number Diff line
@@ -1891,6 +1891,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;
@@ -1908,9 +1909,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;