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

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

drm/amdgpu: Check late_init status before set cg/pg state 



Fix cg/pg unexpected set in hw init failed case.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73f847db

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1656,7 +1656,7 @@ static int amdgpu_device_set_cg_state(struct amdgpu_device *adev, 




	for (j = 0; j < adev->num_ip_blocks; j++) {

	for (j = 0; j < adev->num_ip_blocks; j++) {

		i = state == AMD_CG_STATE_GATE ? j : adev->num_ip_blocks - j - 1;

		i = state == AMD_CG_STATE_GATE ? j : adev->num_ip_blocks - j - 1;

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

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

			continue;

			continue;

		/* skip CG for VCE/UVD, it's handled specially */

		/* skip CG for VCE/UVD, it's handled specially */

		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&

		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
@@ -1686,7 +1686,7 @@ static int amdgpu_device_set_pg_state(struct amdgpu_device *adev, enum amd_power 




	for (j = 0; j < adev->num_ip_blocks; j++) {

	for (j = 0; j < adev->num_ip_blocks; j++) {

		i = state == AMD_PG_STATE_GATE ? j : adev->num_ip_blocks - j - 1;

		i = state == AMD_PG_STATE_GATE ? j : adev->num_ip_blocks - j - 1;

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

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

			continue;

			continue;

		/* skip CG for VCE/UVD, it's handled specially */

		/* skip CG for VCE/UVD, it's handled specially */

		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&

		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&