drm/amdgpu: Add support for BAMACO mode checking

Optimize the code to add support for BAMACO mode checking

Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index e4277298cf1aad3518025b898162ea6224e874de..6ea893ad9a3621a31b8ee254edfc9f6cedc8d4cb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2744,7 +2744,8 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev)
                drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;
        } else if (adev->pm.rpm_mode == AMDGPU_RUNPM_BOCO) {
                /* nothing to do */
-       } else if (adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) {
+       } else if ((adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) ||
+                       (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO)) {
                amdgpu_device_baco_enter(drm_dev);
        }
 
@@ -2784,7 +2785,8 @@ static int amdgpu_pmops_runtime_resume(struct device *dev)
                 * PCI core handles it for _PR3.
                 */
                pci_set_master(pdev);
-       } else if (adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) {
+       } else if ((adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) ||
+                       (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO)) {
                amdgpu_device_baco_exit(drm_dev);
        }
        ret = amdgpu_device_resume(drm_dev, false);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index a2df3025a754b7cc29376b5ff65c3f9c11b8cdb9..55eb4e4eb8f2f175b3ccc7abe35b6616f4ce2052 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -133,6 +133,7 @@ void amdgpu_register_gpu_instance(struct amdgpu_device *adev)
 int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
 {
        struct drm_device *dev;
+       int bamaco_support = 0;
        int r, acpi_status;
 
        dev = adev_to_drm(adev);
@@ -158,8 +159,12 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
                   (amdgpu_runtime_pm != 0)) { /* enable boco as runtime mode */
                adev->pm.rpm_mode = AMDGPU_RUNPM_BOCO;
                dev_info(adev->dev, "Using BOCO for runtime pm\n");
-       } else if (amdgpu_device_supports_baco(dev) &&
-                  (amdgpu_runtime_pm != 0)) {
+       } else if (amdgpu_runtime_pm != 0) {
+               bamaco_support = amdgpu_device_supports_baco(dev);
+
+               if (!bamaco_support)
+                       goto no_runtime_pm;
+
                switch (adev->asic_type) {
                case CHIP_VEGA20:
                case CHIP_ARCTURUS:
@@ -178,10 +183,20 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
                        break;
                }
 
-               if (adev->pm.rpm_mode == AMDGPU_RUNPM_BACO)
-                       dev_info(adev->dev, "Using BACO for runtime pm\n");
+               if (adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) {
+                       if (bamaco_support & MACO_SUPPORT) {
+                               adev->pm.rpm_mode = AMDGPU_RUNPM_BAMACO;
+                               dev_info(adev->dev, "Using BAMACO for runtime pm\n");
+                       } else {
+                               dev_info(adev->dev, "Using BACO for runtime pm\n");
+                       }
+               }
        }
 
+no_runtime_pm:
+       if (adev->pm.rpm_mode == AMDGPU_RUNPM_NONE)
+               dev_info(adev->dev, "NO pm mode for runtime pm\n");
+
        /* Call ACPI methods: require modeset init
         * but failure is not fatal
         */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 83bf86352267d2df7d919d4b5d3ebce48f013a3a..edae581059af083feda6d5dfe0210d4467487f47 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2622,7 +2622,8 @@ static int psp_load_p2s_table(struct psp_context *psp)
        struct amdgpu_firmware_info *ucode =
                &adev->firmware.ucode[AMDGPU_UCODE_ID_P2S_TABLE];
 
-       if (adev->in_runpm && (adev->pm.rpm_mode == AMDGPU_RUNPM_BACO))
+       if (adev->in_runpm && ((adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) ||
+                               (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO)))
                return 0;
 
        if (amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6)) {
@@ -2652,7 +2653,8 @@ static int psp_load_smu_fw(struct psp_context *psp)
         * Skip SMU FW reloading in case of using BACO for runpm only,
         * as SMU is always alive.
         */
-       if (adev->in_runpm && (adev->pm.rpm_mode == AMDGPU_RUNPM_BACO))
+       if (adev->in_runpm && ((adev->pm.rpm_mode == AMDGPU_RUNPM_BACO) ||
+                               (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO)))
                return 0;
 
        if (!ucode->fw || amdgpu_sriov_vf(psp->adev))