Commit df6e463d authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: validate sw_init before function call 



Before making a function call to sw_init, validate
the function pointer like we do in late_init.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 10112bf8

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

+7 −5
Original line number Diff line number Diff line
@@ -2851,12 +2851,14 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.valid)

			continue;

		if (adev->ip_blocks[i].version->funcs->sw_init) {

			r = adev->ip_blocks[i].version->funcs->sw_init(&adev->ip_blocks[i]);

			if (r) {

				DRM_ERROR("sw_init of IP block <%s> failed %d\n",

					  adev->ip_blocks[i].version->funcs->name, r);

				goto init_failed;

			}

		}

		adev->ip_blocks[i].status.sw = true;



		if (!amdgpu_ip_member_of_hwini(