Commit c722865a authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: check function points valid before use. (v3) 



v2: agd: integrate Christian's comments.
v3: print error message if call fails

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5463545b

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

+18 −14
Original line number Diff line number Diff line
@@ -1191,13 +1191,15 @@ int amdgpu_set_clockgating_state(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->type == block_type) {

			r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev,

										     state);

		if (adev->ip_blocks[i].version->type != block_type)

			continue;

		if (!adev->ip_blocks[i].version->funcs->set_clockgating_state)

			continue;

		r = adev->ip_blocks[i].version->funcs->set_clockgating_state(

			(void *)adev, state);

		if (r)

				return r;

			break;

		}

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

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

	}

	return r;

}
@@ -1211,13 +1213,15 @@ int amdgpu_set_powergating_state(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->type == block_type) {

			r = adev->ip_blocks[i].version->funcs->set_powergating_state((void *)adev,

										     state);

		if (adev->ip_blocks[i].version->type != block_type)

			continue;

		if (!adev->ip_blocks[i].version->funcs->set_powergating_state)

			continue;

		r = adev->ip_blocks[i].version->funcs->set_powergating_state(

			(void *)adev, state);

		if (r)

				return r;

			break;

		}

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

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

	}

	return r;

}