Commit 5cccf10f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: disable workload profile switching when OD is enabled 

Users have reported that they have to reduce the level of undervolting
to acheive stability when dynamic workload profiles are enabled on
GC 10.3.x. Disable dynamic workload profiles if the user has enabled
OD.

Fixes: b9467983 ("drm/amdgpu: add dynamic workload profile switching for gfx10")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4262


Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.15.x
parent d26625d0

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

+8 −0
Original line number Diff line number Diff line
@@ -2228,6 +2228,9 @@ void amdgpu_gfx_profile_ring_begin_use(struct amdgpu_ring *ring) 
	enum PP_SMC_POWER_PROFILE profile;

	int r;



	if (amdgpu_dpm_is_overdrive_enabled(adev))

		return;



	if (adev->gfx.num_gfx_rings)

		profile = PP_SMC_POWER_PROFILE_FULLSCREEN3D;

	else
@@ -2258,6 +2261,11 @@ void amdgpu_gfx_profile_ring_begin_use(struct amdgpu_ring *ring) 


void amdgpu_gfx_profile_ring_end_use(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;



	if (amdgpu_dpm_is_overdrive_enabled(adev))

		return;



	atomic_dec(&ring->adev->gfx.total_submission_cnt);



	schedule_delayed_work(&ring->adev->gfx.idle_work, GFX_PROFILE_IDLE_TIMEOUT);

drivers/gpu/drm/amd/pm/amdgpu_dpm.c

+22 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,28 @@ int amdgpu_dpm_is_overdrive_supported(struct amdgpu_device *adev) 
	}

}



int amdgpu_dpm_is_overdrive_enabled(struct amdgpu_device *adev)

{

	if (is_support_sw_smu(adev)) {

		struct smu_context *smu = adev->powerplay.pp_handle;



		return smu->od_enabled;

	} else {

		struct pp_hwmgr *hwmgr;



		/*

		 * dpm on some legacy asics don't carry od_enabled member

		 * as its pp_handle is casted directly from adev.

		 */

		if (amdgpu_dpm_is_legacy_dpm(adev))

			return false;



		hwmgr = (struct pp_hwmgr *)adev->powerplay.pp_handle;



		return hwmgr->od_enabled;

	}

}



int amdgpu_dpm_set_pp_table(struct amdgpu_device *adev,

			    const char *buf,

			    size_t size)

drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ int amdgpu_dpm_get_smu_prv_buf_details(struct amdgpu_device *adev, 
				       void **addr,

				       size_t *size);

int amdgpu_dpm_is_overdrive_supported(struct amdgpu_device *adev);

int amdgpu_dpm_is_overdrive_enabled(struct amdgpu_device *adev);

int amdgpu_dpm_set_pp_table(struct amdgpu_device *adev,

			    const char *buf,

			    size_t size);