drm/amdgpu/soc15: add support for baco reset with swSMU

Add support for vega20 when the swSMU path is used.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 86bc4cbefbce6a28c6e9ae959427d0919dc13189..9be0168217f55d2fa81060145a7a24c9f172fbc6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -478,44 +478,59 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)
 
 static int soc15_asic_get_baco_capability(struct amdgpu_device *adev, bool *cap)
 {
-       void *pp_handle = adev->powerplay.pp_handle;
-       const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
+       if (is_support_sw_smu(adev)) {
+               struct smu_context *smu = &adev->smu;
 
-       if (!pp_funcs || !pp_funcs->get_asic_baco_capability) {
-               *cap = false;
-               return -ENOENT;
-       }
+               *cap = smu_baco_is_support(smu);
+               return 0;
+       } else {
+               void *pp_handle = adev->powerplay.pp_handle;
+               const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
 
-       return pp_funcs->get_asic_baco_capability(pp_handle, cap);
+               if (!pp_funcs || !pp_funcs->get_asic_baco_capability) {
+                       *cap = false;
+                       return -ENOENT;
+               }
+
+               return pp_funcs->get_asic_baco_capability(pp_handle, cap);
+       }
 }
 
 static int soc15_asic_baco_reset(struct amdgpu_device *adev)
 {
-       void *pp_handle = adev->powerplay.pp_handle;
-       const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
        struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
 
-       if (!pp_funcs ||!pp_funcs->get_asic_baco_state ||!pp_funcs->set_asic_baco_state)
-               return -ENOENT;
-
        /* avoid NBIF got stuck when do RAS recovery in BACO reset */
        if (ras && ras->supported)
                adev->nbio.funcs->enable_doorbell_interrupt(adev, false);
 
-       /* enter BACO state */
-       if (pp_funcs->set_asic_baco_state(pp_handle, 1))
-               return -EIO;
+       dev_info(adev->dev, "GPU BACO reset\n");
+
+       if (is_support_sw_smu(adev)) {
+               struct smu_context *smu = &adev->smu;
+
+               if (smu_baco_reset(smu))
+                       return -EIO;
+       } else {
+               void *pp_handle = adev->powerplay.pp_handle;
+               const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
+
+               if (!pp_funcs ||!pp_funcs->get_asic_baco_state ||!pp_funcs->set_asic_baco_state)
+                       return -ENOENT;
 
-       /* exit BACO state */
-       if (pp_funcs->set_asic_baco_state(pp_handle, 0))
-               return -EIO;
+               /* enter BACO state */
+               if (pp_funcs->set_asic_baco_state(pp_handle, 1))
+                       return -EIO;
+
+               /* exit BACO state */
+               if (pp_funcs->set_asic_baco_state(pp_handle, 0))
+                       return -EIO;
+       }
 
        /* re-enable doorbell interrupt after BACO exit */
        if (ras && ras->supported)
                adev->nbio.funcs->enable_doorbell_interrupt(adev, true);
 
-       dev_info(adev->dev, "GPU BACO reset\n");
-
        return 0;
 }