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

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

drm/amdgpu/gfx9: support the amdgpu.disable_cu option 



This is ported from gfx8.

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

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

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

}



static void gfx_v9_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_SOC15(GC, 0, mmGC_USER_SHADER_ARRAY_CONFIG, data);

}



static u32 gfx_v9_0_get_cu_active_bitmap(struct amdgpu_device *adev)

{

	u32 data, mask;
@@ -4436,10 +4450,13 @@ static int gfx_v9_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;

	unsigned disable_masks[4 * 2];



	if (!adev || !cu_info)

		return -EINVAL;



	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++) {
@@ -4447,6 +4464,9 @@ static int gfx_v9_0_get_cu_info(struct amdgpu_device *adev, 
			ao_bitmap = 0;

			counter = 0;

			gfx_v9_0_select_se_sh(adev, i, j, 0xffffffff);

			if (i < 4 && j < 2)

				gfx_v9_0_set_user_cu_inactive_bitmap(

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

			bitmap = gfx_v9_0_get_cu_active_bitmap(adev);

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