drm/amdgpu: add support to powerup VPE by SMU

Powerup VPE by SMU.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
index 1b17a71ed45e6a7549a16446719743b9868d3694..acf3527fff2dbfb9dba466d865c3d48e2171bcb8 100644 (file)
--- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
@@ -93,6 +93,7 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block
        case AMD_IP_BLOCK_TYPE_JPEG:
        case AMD_IP_BLOCK_TYPE_GMC:
        case AMD_IP_BLOCK_TYPE_ACP:
+       case AMD_IP_BLOCK_TYPE_VPE:
                if (pp_funcs && pp_funcs->set_powergating_by_smu)
                        ret = (pp_funcs->set_powergating_by_smu(
                                (adev)->powerplay.pp_handle, block_type, gate));

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 0b4f9f2ca529f67ef83825d8a116e177fc1d0708..df513347cb73191c28509cfe610ba244272a56c9 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -279,6 +279,26 @@ static int smu_dpm_set_jpeg_enable(struct smu_context *smu,
        return ret;
 }
 
+static int smu_dpm_set_vpe_enable(struct smu_context *smu,
+                                  bool enable)
+{
+       struct smu_power_context *smu_power = &smu->smu_power;
+       struct smu_power_gate *power_gate = &smu_power->power_gate;
+       int ret = 0;
+
+       if (!smu->ppt_funcs->dpm_set_vpe_enable)
+               return 0;
+
+       if (atomic_read(&power_gate->vpe_gated) ^ enable)
+               return 0;
+
+       ret = smu->ppt_funcs->dpm_set_vpe_enable(smu, enable);
+       if (!ret)
+               atomic_set(&power_gate->vpe_gated, !enable);
+
+       return ret;
+}
+
 /**
  * smu_dpm_set_power_gate - power gate/ungate the specific IP block
  *
@@ -337,6 +357,12 @@ static int smu_dpm_set_power_gate(void *handle,
                        dev_err(smu->adev->dev, "Failed to power %s JPEG!\n",
                                gate ? "gate" : "ungate");
                break;
+       case AMD_IP_BLOCK_TYPE_VPE:
+               ret = smu_dpm_set_vpe_enable(smu, !gate);
+               if (ret)
+                       dev_err(smu->adev->dev, "Failed to power %s VPE!\n",
+                               gate ? "gate" : "ungate");
+               break;
        default:
                dev_err(smu->adev->dev, "Unsupported block type!\n");
                return -EINVAL;
@@ -1169,6 +1195,7 @@ static int smu_sw_init(void *handle)
 
        atomic_set(&smu->smu_power.power_gate.vcn_gated, 1);
        atomic_set(&smu->smu_power.power_gate.jpeg_gated, 1);
+       atomic_set(&smu->smu_power.power_gate.vpe_gated, 1);
 
        smu->workload_mask = 1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT];
        smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT] = 0;
@@ -1521,6 +1548,7 @@ static int smu_hw_init(void *handle)
                        return ret;
                smu_dpm_set_vcn_enable(smu, true);
                smu_dpm_set_jpeg_enable(smu, true);
+               smu_dpm_set_vpe_enable(smu, true);
                smu_set_gfx_cgpg(smu, true);
        }
 
@@ -1697,6 +1725,7 @@ static int smu_hw_fini(void *handle)
 
        smu_dpm_set_vcn_enable(smu, false);
        smu_dpm_set_jpeg_enable(smu, false);
+       smu_dpm_set_vpe_enable(smu, false);
 
        adev->vcn.cur_state = AMD_PG_STATE_GATE;
        adev->jpeg.cur_state = AMD_PG_STATE_GATE;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index 72d632be0ee6b29847971dbad1a670a78f63db45..c8cd4e3a3d3b11f77d0591148a572462a9a2d71a 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -374,6 +374,7 @@ struct smu_power_gate {
        bool vce_gated;
        atomic_t vcn_gated;
        atomic_t jpeg_gated;
+       atomic_t vpe_gated;
 };
 
 struct smu_power_context {