drm/amdgpu: fix get_max_engine_clock_in_mhz

[ 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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 5432af39a674a9b2d3c38039e17433592c4bea86..f7fa7675215c278c84ddcda4801ddf245861c05c 100644 (file)
--- 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(struct kgd_dev *kgd)
 {
        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;
 }