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

Commit dbfe85ea authored by Flora Cui's avatar Flora Cui Committed by Alex Deucher
Browse files

drm/amdgpu: Fix the exported always on CU bitmap 



Newer asics with 4 SEs are not able to fit the entire bitmask in the
original field, use an array instead.

v2: keep cu_ao_mask for backward compatibility.

Signed-off-by: default avatarFlora Cui <Flora.Cui@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 552c8f76

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −2
Original line number Diff line number Diff line
@@ -1028,12 +1028,15 @@ struct amdgpu_gfx_config { 
};



struct amdgpu_cu_info {

	uint32_t number; /* total active CU number */

	uint32_t ao_cu_mask;

	uint32_t max_waves_per_simd;

	uint32_t wave_front_size;

	uint32_t max_scratch_slots_per_cu;

	uint32_t lds_size;



	/* total active CU number */

	uint32_t number;

	uint32_t ao_cu_mask;

	uint32_t ao_cu_bitmap[4][4];

	uint32_t bitmap[4][4];

};

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

+2 −1
Original line number Diff line number Diff line
@@ -67,9 +67,10 @@ 
 * - 3.15.0 - Export more gpu info for gfx9

 * - 3.16.0 - Add reserved vmid support

 * - 3.17.0 - Add AMDGPU_NUM_VRAM_CPU_PAGE_FAULTS.

 * - 3.18.0 - Export gpu always on cu bitmap

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	17

#define KMS_DRIVER_MINOR	18

#define KMS_DRIVER_PATCHLEVEL	0



int amdgpu_vram_limit = 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -594,6 +594,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		dev_info.cu_active_number = adev->gfx.cu_info.number;

		dev_info.cu_ao_mask = adev->gfx.cu_info.ao_cu_mask;

		dev_info.ce_ram_size = adev->gfx.ce_ram_size;

		memcpy(&dev_info.cu_ao_bitmap[0], &adev->gfx.cu_info.ao_cu_bitmap[0],

		       sizeof(adev->gfx.cu_info.ao_cu_bitmap));

		memcpy(&dev_info.cu_bitmap[0], &adev->gfx.cu_info.bitmap[0],

		       sizeof(adev->gfx.cu_info.bitmap));

		dev_info.vram_type = adev->mc.vram_type;

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

+3 −1
Original line number Diff line number Diff line
@@ -3535,7 +3535,9 @@ static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev) 
				mask <<= 1;

			}

			active_cu_number += counter;

			if (i < 2 && j < 2)

				ao_cu_mask |= (ao_bitmap << (i * 16 + j * 8));

			cu_info->ao_cu_bitmap[i][j] = ao_bitmap;

		}

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -5427,7 +5427,9 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) 
				mask <<= 1;

			}

			active_cu_number += counter;

			if (i < 2 && j < 2)

				ao_cu_mask |= (ao_bitmap << (i * 16 + j * 8));

			cu_info->ao_cu_bitmap[i][j] = ao_bitmap;

		}

	}

	gfx_v7_0_select_se_sh(adev, 0xffffffff, 0xffffffff, 0xffffffff);