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

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

drm/amdgpu: Ctrl gfx off via amdgpu_gfx_off_ctrl 



use amdgpu_gfx_off_ctrl function so driver can arbitrate
whether the gfx ip can be power off or power on.

Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1e317b99

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

+2 −4
Original line number Diff line number Diff line
@@ -1828,8 +1828,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
					  adev->ip_blocks[i].version->funcs->name, r);

				return r;

			}

			if (adev->powerplay.pp_funcs->set_powergating_by_smu)

				amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, false);

			amdgpu_gfx_off_ctrl(adev, false);

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

			/* XXX handle errors */

			if (r) {
@@ -2012,8 +2011,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
	}



	/* call smu to disable gfx off feature first when suspend */

	if (adev->powerplay.pp_funcs->set_powergating_by_smu)

		amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, false);

	amdgpu_gfx_off_ctrl(adev, false);



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

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

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

+2 −4
Original line number Diff line number Diff line
@@ -3783,13 +3783,11 @@ static int gfx_v9_0_set_powergating_state(void *handle, 
		gfx_v9_0_update_gfx_mg_power_gating(adev, enable);



		/* set gfx off through smu */

		if (enable && adev->powerplay.pp_funcs->set_powergating_by_smu)

			amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, true);

		amdgpu_gfx_off_ctrl(adev, true);

		break;

	case CHIP_VEGA12:

		/* set gfx off through smu */

		if (enable && adev->powerplay.pp_funcs->set_powergating_by_smu)

			amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_GFX, true);

		amdgpu_gfx_off_ctrl(adev, true);

		break;

	default:

		break;