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

drm/amdgpu: validate hw_fini before function call 



Before making a function call to hw_fini, validate
the function pointer like we do in sw_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 88344561

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

+22 −16
Original line number Diff line number Diff line
@@ -3269,6 +3269,25 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
	return 0;

}



static void amdgpu_ip_block_hw_fini(struct amdgpu_ip_block *ip_block)

{

	int r;



	if (ip_block->version->funcs->hw_fini) {

		DRM_ERROR("hw_fini of IP block <%s> not defined\n",

			  ip_block->version->funcs->name);

	} else {

		r = ip_block->version->funcs->hw_fini(ip_block);

		/* XXX handle errors */

		if (r) {

			DRM_DEBUG("hw_fini of IP block <%s> failed %d\n",

				  ip_block->version->funcs->name, r);

		}

	}



	ip_block->status.hw = false;

}



/**

 * amdgpu_device_smu_fini_early - smu hw_fini wrapper

 *
@@ -3278,7 +3297,7 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
 */

static void amdgpu_device_smu_fini_early(struct amdgpu_device *adev)

{

	int i, r;

	int i;



	if (amdgpu_ip_version(adev, GC_HWIP, 0) > IP_VERSION(9, 0, 0))

		return;
@@ -3287,13 +3306,7 @@ static void amdgpu_device_smu_fini_early(struct amdgpu_device *adev) 
		if (!adev->ip_blocks[i].status.hw)

			continue;

		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {

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

			/* XXX handle errors */

			if (r) {

				DRM_DEBUG("hw_fini of IP block <%s> failed %d\n",

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

			}

			adev->ip_blocks[i].status.hw = false;

			amdgpu_ip_block_hw_fini(&adev->ip_blocks[i]);

			break;

		}

	}
@@ -3326,14 +3339,7 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev) 
		if (!adev->ip_blocks[i].status.hw)

			continue;



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

		/* XXX handle errors */

		if (r) {

			DRM_DEBUG("hw_fini of IP block <%s> failed %d\n",

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

		}



		adev->ip_blocks[i].status.hw = false;

		amdgpu_ip_block_hw_fini(&adev->ip_blocks[i]);

	}



	if (amdgpu_sriov_vf(adev)) {