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

drm/amdkfd: Make get_tile_config() generic 



Given we can query all the asic specific information from amdgpu_gfx_config,
we can make get_tile_config() generic.

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 94b5c215

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

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, 
void amdgpu_amdkfd_gpuvm_init_mem_limits(void);

void amdgpu_amdkfd_unreserve_memory_limit(struct amdgpu_bo *bo);



int amdgpu_amdkfd_get_tile_config(struct kgd_dev *kgd,

				struct tile_config *config);



/* KGD2KFD callbacks */

int kgd2kfd_init(void);

void kgd2kfd_exit(void);

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

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
	.address_watch_get_offset = kgd_gfx_v9_address_watch_get_offset,

	.get_atc_vmid_pasid_mapping_info =

			kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.get_tile_config = kgd_gfx_v9_get_tile_config,

	.set_vm_context_page_table_base = kgd_set_vm_context_page_table_base,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

};

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

+0 −33
Original line number Diff line number Diff line
@@ -42,38 +42,6 @@ enum hqd_dequeue_request_type { 
	SAVE_WAVES

};



/* Because of REG_GET_FIELD() being used, we put this function in the

 * asic specific file.

 */

static int amdgpu_amdkfd_get_tile_config(struct kgd_dev *kgd,

		struct tile_config *config)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	config->gb_addr_config = adev->gfx.config.gb_addr_config;

#if 0

/* TODO - confirm REG_GET_FIELD x2, should be OK as is... but

 * MC_ARB_RAMCFG register doesn't exist on Vega10 - initial amdgpu

 * changes commented out related code, doing the same here for now but

 * need to sync with Ken et al

 */

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

				MC_ARB_RAMCFG, NOOFBANK);

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

				MC_ARB_RAMCFG, NOOFRANKS);

#endif



	config->tile_config_ptr = adev->gfx.config.tile_mode_array;

	config->num_tile_configs =

			ARRAY_SIZE(adev->gfx.config.tile_mode_array);

	config->macro_tile_config_ptr =

			adev->gfx.config.macrotile_mode_array;

	config->num_macro_tile_configs =

			ARRAY_SIZE(adev->gfx.config.macrotile_mode_array);



	return 0;

}



static inline struct amdgpu_device *get_amdgpu_device(struct kgd_dev *kgd)

{

	return (struct amdgpu_device *)kgd;
@@ -805,7 +773,6 @@ const struct kfd2kgd_calls gfx_v10_kfd2kgd = { 
	.address_watch_get_offset = kgd_address_watch_get_offset,

	.get_atc_vmid_pasid_mapping_info =

			get_atc_vmid_pasid_mapping_info,

	.get_tile_config = amdgpu_amdkfd_get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

	.get_unique_id = amdgpu_amdkfd_get_unique_id,

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

+0 −26
Original line number Diff line number Diff line
@@ -84,31 +84,6 @@ union TCP_WATCH_CNTL_BITS { 
	float f32All;

};



/* Because of REG_GET_FIELD() being used, we put this function in the

 * asic specific file.

 */

static int get_tile_config(struct kgd_dev *kgd,

		struct tile_config *config)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	config->gb_addr_config = adev->gfx.config.gb_addr_config;

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

				MC_ARB_RAMCFG, NOOFBANK);

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

				MC_ARB_RAMCFG, NOOFRANKS);



	config->tile_config_ptr = adev->gfx.config.tile_mode_array;

	config->num_tile_configs =

			ARRAY_SIZE(adev->gfx.config.tile_mode_array);

	config->macro_tile_config_ptr =

			adev->gfx.config.macrotile_mode_array;

	config->num_macro_tile_configs =

			ARRAY_SIZE(adev->gfx.config.macrotile_mode_array);



	return 0;

}



static inline struct amdgpu_device *get_amdgpu_device(struct kgd_dev *kgd)

{

	return (struct amdgpu_device *)kgd;
@@ -730,7 +705,6 @@ const struct kfd2kgd_calls gfx_v7_kfd2kgd = { 
	.address_watch_get_offset = kgd_address_watch_get_offset,

	.get_atc_vmid_pasid_mapping_info = get_atc_vmid_pasid_mapping_info,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.read_vmid_from_vmfault_reg = read_vmid_from_vmfault_reg,

};

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

+0 −26
Original line number Diff line number Diff line
@@ -41,31 +41,6 @@ enum hqd_dequeue_request_type { 
	RESET_WAVES

};



/* Because of REG_GET_FIELD() being used, we put this function in the

 * asic specific file.

 */

static int get_tile_config(struct kgd_dev *kgd,

		struct tile_config *config)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	config->gb_addr_config = adev->gfx.config.gb_addr_config;

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

				MC_ARB_RAMCFG, NOOFBANK);

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

				MC_ARB_RAMCFG, NOOFRANKS);



	config->tile_config_ptr = adev->gfx.config.tile_mode_array;

	config->num_tile_configs =

			ARRAY_SIZE(adev->gfx.config.tile_mode_array);

	config->macro_tile_config_ptr =

			adev->gfx.config.macrotile_mode_array;

	config->num_macro_tile_configs =

			ARRAY_SIZE(adev->gfx.config.macrotile_mode_array);



	return 0;

}



static inline struct amdgpu_device *get_amdgpu_device(struct kgd_dev *kgd)

{

	return (struct amdgpu_device *)kgd;
@@ -676,6 +651,5 @@ const struct kfd2kgd_calls gfx_v8_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

			get_atc_vmid_pasid_mapping_info,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

};