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

Commit 6c6cde55 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdkfd: Add mqd size in mqd manager struct 



Also initialize mqd size on mqd manager initialization

Signed-off-by: default avatarOak Zeng <ozeng@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fdfa090b

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ struct mqd_manager { 


	struct mutex	mqd_mutex;

	struct kfd_dev	*dev;

	uint32_t mqd_size;

};



void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c

+4 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct cik_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -411,6 +412,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct cik_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -422,6 +424,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct cik_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -433,6 +436,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

		mqd->is_occupied = is_occupied_sdma;

		mqd->mqd_size = sizeof(struct cik_sdma_rlc_registers);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;

#endif

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c

+4 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->get_wave_state = get_wave_state;

		mqd->mqd_size = sizeof(struct v9_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -470,6 +471,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct v9_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -481,6 +483,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct v9_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -492,6 +495,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

		mqd->is_occupied = is_occupied_sdma;

		mqd->mqd_size = sizeof(struct v9_sdma_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;

#endif

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c

+4 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->get_wave_state = get_wave_state;

		mqd->mqd_size = sizeof(struct vi_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -470,6 +471,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct vi_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -481,6 +483,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct vi_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -492,6 +495,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

		mqd->is_occupied = is_occupied_sdma;

		mqd->mqd_size = sizeof(struct vi_sdma_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;

#endif