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

Commit fe723cd3 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu:fix get wrong gfx always on cu masks. 



Bug: SWDEV-117987: Always on CU mask broken for gfx7+

Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 94c9cead

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

+8 −2
Original line number Diff line number Diff line
@@ -3719,6 +3719,12 @@ static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev) 
	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;

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

	unsigned disable_masks[4 * 2];

	u32 ao_cu_num;



	if (adev->flags & AMD_IS_APU)

		ao_cu_num = 2;

	else

		ao_cu_num = adev->gfx.config.max_cu_per_sh;



	memset(cu_info, 0, sizeof(*cu_info));
@@ -3737,9 +3743,9 @@ static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev) 
			bitmap = gfx_v6_0_get_cu_enabled(adev);

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



			for (k = 0; k < 16; k++) {

			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k++) {

				if (bitmap & mask) {

					if (counter < 2)

					if (counter < ao_cu_num)

						ao_bitmap |= mask;

					counter ++;

				}

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

+8 −2
Original line number Diff line number Diff line
@@ -5339,6 +5339,12 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) 
	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;

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

	unsigned disable_masks[4 * 2];

	u32 ao_cu_num;



	if (adev->flags & AMD_IS_APU)

		ao_cu_num = 2;

	else

		ao_cu_num = adev->gfx.config.max_cu_per_sh;



	memset(cu_info, 0, sizeof(*cu_info));
@@ -5357,9 +5363,9 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) 
			bitmap = gfx_v7_0_get_cu_active_bitmap(adev);

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



			for (k = 0; k < 16; k ++) {

			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k ++) {

				if (bitmap & mask) {

					if (counter < 2)

					if (counter < ao_cu_num)

						ao_bitmap |= mask;

					counter ++;

				}

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

+8 −2
Original line number Diff line number Diff line
@@ -7109,9 +7109,15 @@ static void gfx_v8_0_get_cu_info(struct amdgpu_device *adev) 
	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;

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

	unsigned disable_masks[4 * 2];

	u32 ao_cu_num;



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



	if (adev->flags & AMD_IS_APU)

		ao_cu_num = 2;

	else

		ao_cu_num = adev->gfx.config.max_cu_per_sh;



	amdgpu_gfx_parse_disable_cu(disable_masks, 4, 2);



	mutex_lock(&adev->grbm_idx_mutex);
@@ -7127,9 +7133,9 @@ static void gfx_v8_0_get_cu_info(struct amdgpu_device *adev) 
			bitmap = gfx_v8_0_get_cu_active_bitmap(adev);

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



			for (k = 0; k < 16; k ++) {

			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k ++) {

				if (bitmap & mask) {

					if (counter < 2)

					if (counter < ao_cu_num)

						ao_bitmap |= mask;

					counter ++;

				}

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

+2 −2
Original line number Diff line number Diff line
@@ -3666,9 +3666,9 @@ static int gfx_v9_0_get_cu_info(struct amdgpu_device *adev, 
			bitmap = gfx_v9_0_get_cu_active_bitmap(adev);

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



			for (k = 0; k < 16; k ++) {

			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k ++) {

				if (bitmap & mask) {

					if (counter < 2)

					if (counter < adev->gfx.config.max_cu_per_sh)

						ao_bitmap |= mask;

					counter ++;

				}