drm/amdgpu/raven: power up/down VCN via the SMU (v2)

By default VCN is powered down like SDMA, power it up/down
on driver load/unload.

[Rui: Fix to add the parameter 0 to un-gate VCN] v2

Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
index 6c931baeeb15ba2a94c27a8e6cd49b2f43c88d61..b69dcb9e6a39f54759730a6a792ab3b2493e7cd2 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
@@ -264,6 +264,27 @@ static int rv_smc_disable_sdma(struct pp_smumgr *smumgr)
        return 0;
 }
 
+/* vcn is disabled by default in vbios, need to re-enable in driver */
+static int rv_smc_enable_vcn(struct pp_smumgr *smumgr)
+{
+       PP_ASSERT_WITH_CODE(!rv_send_msg_to_smc_with_parameter(smumgr,
+                       PPSMC_MSG_PowerUpVcn, 0),
+                       "Attempt to power up vcn Failed!",
+                       return -EINVAL);
+
+       return 0;
+}
+
+static int rv_smc_disable_vcn(struct pp_smumgr *smumgr)
+{
+       PP_ASSERT_WITH_CODE(!rv_send_msg_to_smc_with_parameter(smumgr,
+                       PPSMC_MSG_PowerDownVcn, 0),
+                       "Attempt to power down vcn Failed!",
+                       return -EINVAL);
+
+       return 0;
+}
+
 static int rv_smu_fini(struct pp_smumgr *smumgr)
 {
        struct rv_smumgr *priv =
@@ -271,6 +292,7 @@ static int rv_smu_fini(struct pp_smumgr *smumgr)
 
        if (priv) {
                rv_smc_disable_sdma(smumgr);
+               rv_smc_disable_vcn(smumgr);
                cgs_free_gpu_mem(smumgr->device,
                                priv->smu_tables.entry[WMTABLE].handle);
                cgs_free_gpu_mem(smumgr->device,
@@ -288,6 +310,8 @@ static int rv_start_smu(struct pp_smumgr *smumgr)
                return -EINVAL;
        if (rv_smc_enable_sdma(smumgr))
                return -EINVAL;
+       if (rv_smc_enable_vcn(smumgr))
+               return -EINVAL;
 
        return 0;
 }