Commit 94b5c215 authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdgpu: Add num_banks and num_ranks to gfx config structure 



The two members will be used by KFD later.

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 60347451

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

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ struct amdgpu_gfx_config { 
	unsigned num_gpus;

	unsigned multi_gpu_tile_size;

	unsigned mc_arb_ramcfg;

	unsigned num_banks;

	unsigned num_ranks;

	unsigned gb_addr_config;

	unsigned num_rbs;

	unsigned gs_vgt_table_depth;

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

+5 −0
Original line number Diff line number Diff line
@@ -4338,6 +4338,11 @@ static void gfx_v7_0_gpu_early_init(struct amdgpu_device *adev) 
	adev->gfx.config.mc_arb_ramcfg = RREG32(mmMC_ARB_RAMCFG);

	mc_arb_ramcfg = adev->gfx.config.mc_arb_ramcfg;



	adev->gfx.config.num_banks = REG_GET_FIELD(mc_arb_ramcfg,

				MC_ARB_RAMCFG, NOOFBANK);

	adev->gfx.config.num_ranks = REG_GET_FIELD(mc_arb_ramcfg,

				MC_ARB_RAMCFG, NOOFRANKS);



	adev->gfx.config.num_tile_pipes = adev->gfx.config.max_tile_pipes;

	adev->gfx.config.mem_max_burst_length_bytes = 256;

	if (adev->flags & AMD_IS_APU) {

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

+5 −0
Original line number Diff line number Diff line
@@ -1820,6 +1820,11 @@ static int gfx_v8_0_gpu_early_init(struct amdgpu_device *adev) 
	adev->gfx.config.mc_arb_ramcfg = RREG32(mmMC_ARB_RAMCFG);

	mc_arb_ramcfg = adev->gfx.config.mc_arb_ramcfg;



	adev->gfx.config.num_banks = REG_GET_FIELD(mc_arb_ramcfg,

				MC_ARB_RAMCFG, NOOFBANK);

	adev->gfx.config.num_ranks = REG_GET_FIELD(mc_arb_ramcfg,

				MC_ARB_RAMCFG, NOOFRANKS);



	adev->gfx.config.num_tile_pipes = adev->gfx.config.max_tile_pipes;

	adev->gfx.config.mem_max_burst_length_bytes = 256;

	if (adev->flags & AMD_IS_APU) {