Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 324c614a authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Alex Deucher
Browse files

drm/amdgpu/gfx7: set USER_SHADER_ARRAY_CONFIG based on disable_cu parameter 



v2: do not overwrite register when bitmap is zero

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6f8941a2

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

+20 −0
Original line number Diff line number Diff line
@@ -3868,6 +3868,20 @@ static void gfx_v7_0_enable_gfx_cgpg(struct amdgpu_device *adev, 
	}

}



static void gfx_v7_0_set_user_cu_inactive_bitmap(struct amdgpu_device *adev,

						 u32 bitmap)

{

	u32 data;



	if (!bitmap)

		return;



	data = bitmap << GC_USER_SHADER_ARRAY_CONFIG__INACTIVE_CUS__SHIFT;

	data &= GC_USER_SHADER_ARRAY_CONFIG__INACTIVE_CUS_MASK;



	WREG32(mmGC_USER_SHADER_ARRAY_CONFIG, data);

}



static u32 gfx_v7_0_get_cu_active_bitmap(struct amdgpu_device *adev)

{

	u32 data, mask;
@@ -5033,9 +5047,12 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) 
	int i, j, k, counter, active_cu_number = 0;

	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;

	struct amdgpu_cu_info *cu_info = &adev->gfx.cu_info;

	unsigned disable_masks[4 * 2];



	memset(cu_info, 0, sizeof(*cu_info));



	amdgpu_gfx_parse_disable_cu(disable_masks, 4, 2);



	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++) {
@@ -5043,6 +5060,9 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) 
			ao_bitmap = 0;

			counter = 0;

			gfx_v7_0_select_se_sh(adev, i, j);

			if (i < 4 && j < 2)

				gfx_v7_0_set_user_cu_inactive_bitmap(

					adev, disable_masks[i * 2 + j]);

			bitmap = gfx_v7_0_get_cu_active_bitmap(adev);

			cu_info->bitmap[i][j] = bitmap;