Commit 0409022c authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdkfd: Fix null ptr access 



Avoid access null xcp_mgr pointer.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f464c5dd

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

+8 −6
Original line number Diff line number Diff line
@@ -644,13 +644,15 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	 * If the VMID range changes for GFX9.4.3, then this code MUST be

	 * revisited.

	 */

	partition_mode = amdgpu_xcp_query_partition_mode(kfd->adev->xcp_mgr, AMDGPU_XCP_FL_LOCKED);

	if (KFD_GC_VERSION(kfd) == IP_VERSION(9, 4, 3) &&

	    partition_mode == AMDGPU_CPX_PARTITION_MODE &&

	if (kfd->adev->xcp_mgr) {

		partition_mode = amdgpu_xcp_query_partition_mode(kfd->adev->xcp_mgr,

								 AMDGPU_XCP_FL_LOCKED);

		if (partition_mode == AMDGPU_CPX_PARTITION_MODE &&

		    kfd->num_nodes != 1) {

			vmid_num_kfd /= 2;

			first_vmid_kfd = last_vmid_kfd + 1 - vmid_num_kfd*2;

		}

	}



	/* Verify module parameters regarding mapped process number*/

	if (hws_max_conc_proc >= 0)