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

Commit 876923fb authored by xinhui pan's avatar xinhui pan Committed by Alex Deucher
Browse files

drm/amdgpu: Fix panic during gpu reset 



Clear the flag after hw suspend, otherwise it skips the corresponding hw
resume.

Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1f288afc

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

+1 −1
Original line number Diff line number Diff line
@@ -2257,6 +2257,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
			DRM_ERROR("suspend of IP block <%s> failed %d\n",

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

		}

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

		/* handle putting the SMC in the appropriate state */

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

			if (is_support_sw_smu(adev)) {
@@ -2271,7 +2272,6 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
						  adev->mp1_state, r);

					return r;

				}

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

			}

		}

	}