| From foo@baz Fri Mar 16 15:43:16 CET 2018 |
| From: Felix Kuehling <Felix.Kuehling@amd.com> |
| Date: Mon, 27 Nov 2017 18:29:43 -0500 |
| Subject: drm/amdgpu: fix get_max_engine_clock_in_mhz |
| |
| From: Felix Kuehling <Felix.Kuehling@amd.com> |
| |
| |
| [ Upstream commit a9efcc19161e20623c285fac967a32842972cebe ] |
| |
| Use proper powerplay function. This fixes OpenCL initialization |
| problems. |
| |
| Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> |
| Acked-by: Oded Gabbay <oded.gabbay@gmail.com> |
| Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c |
| @@ -265,6 +265,9 @@ uint32_t get_max_engine_clock_in_mhz(str |
| { |
| struct amdgpu_device *adev = (struct amdgpu_device *)kgd; |
| |
| - /* The sclk is in quantas of 10kHz */ |
| - return adev->pm.dpm.dyn_state.max_clock_voltage_on_ac.sclk / 100; |
| + /* the sclk is in quantas of 10kHz */ |
| + if (amdgpu_sriov_vf(adev)) |
| + return adev->clock.default_sclk / 100; |
| + |
| + return amdgpu_dpm_get_sclk(adev, false) / 100; |
| } |
