Commit 5804463a authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resume" 



This reverts commit f543d286.

This is no longer needed since we no longer touch SDMA 5.x for s0i3.

Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a7798ea

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

+0 −16
Original line number Diff line number Diff line
@@ -3234,15 +3234,6 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) 
			return r;

		}

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



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

			/* disable gfxoff for IP resume. The gfxoff will be re-enabled in

			 * amdgpu_device_resume() after IP resume.

			 */

			amdgpu_gfx_off_ctrl(adev, false);

			DRM_DEBUG("will disable gfxoff for re-initializing other blocks\n");

		}



	}



	return 0;
@@ -4230,13 +4221,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	/* Make sure IB tests flushed */

	flush_delayed_work(&adev->delayed_init_work);



	if (adev->in_s0ix) {

		/* re-enable gfxoff after IP resume. This re-enables gfxoff after

		 * it was disabled for IP resume in amdgpu_device_ip_resume_phase2().

		 */

		amdgpu_gfx_off_ctrl(adev, true);

		DRM_DEBUG("will enable gfxoff for the mission mode\n");

	}

	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, false);