drm/amd/pm: unified smu feature cap for vcn reset

unified vcn reset smu feature cap

Signed-off-by: Yang Wang <kevinyang.wang@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/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index c4ce056a16136cc4714c0cb84b3a9bb8005e5d33..715579950dd8bc802ba7f9b4d5570598f37a20f3 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -4144,12 +4144,7 @@ int smu_reset_sdma(struct smu_context *smu, uint32_t inst_mask)
 
 bool smu_reset_vcn_is_supported(struct smu_context *smu)
 {
-       bool ret = false;
-
-       if (smu->ppt_funcs && smu->ppt_funcs->reset_vcn_is_supported)
-               ret = smu->ppt_funcs->reset_vcn_is_supported(smu);
-
-       return ret;
+       return smu_feature_cap_test(smu, SMU_FEATURE_CAP_ID__VCN_RESET);
 }
 
 int smu_reset_vcn(struct smu_context *smu, uint32_t inst_mask)

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 5f07a04fdebca3fe1389c1cfc0e1a944ed0a00a3..582c186d8b6230ef85289fbf76e7d9270b686c9b 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -531,6 +531,7 @@ enum smu_fw_status {
 enum smu_feature_cap_id {
        SMU_FEATURE_CAP_ID__LINK_RESET = 0,
        SMU_FEATURE_CAP_ID__SDMA_RESET,
+       SMU_FEATURE_CAP_ID__VCN_RESET,
        SMU_FEATURE_CAP_ID__COUNT,
 };
 
@@ -1438,10 +1439,6 @@ struct pptable_funcs {
         * @reset_vcn: message SMU to soft reset vcn instance.
         */
        int (*dpm_reset_vcn)(struct smu_context *smu, uint32_t inst_mask);
-       /**
-        * @reset_vcn_is_supported: Check if support resets vcn.
-        */
-       bool (*reset_vcn_is_supported)(struct smu_context *smu);
 
        /**
         * @get_ecc_table:  message SMU to get ECC INFO table.

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index 73defde12e8ae593c9dcea3bd19bb7a97be63024..bcd6525ca5e91ebd47d5f0b19df19795f796fc8f 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -3235,6 +3235,9 @@ static int smu_v13_0_6_post_init(struct smu_context *smu)
        if (smu_v13_0_6_reset_sdma_is_supported(smu))
                smu_feature_cap_set(smu, SMU_FEATURE_CAP_ID__SDMA_RESET);
 
+       if (smu_v13_0_6_reset_vcn_is_supported(smu))
+               smu_feature_cap_set(smu, SMU_FEATURE_CAP_ID__VCN_RESET);
+
        return 0;
 }
 
@@ -3917,7 +3920,6 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = {
        .send_rma_reason = smu_v13_0_6_send_rma_reason,
        .reset_sdma = smu_v13_0_6_reset_sdma,
        .dpm_reset_vcn = smu_v13_0_6_reset_vcn,
-       .reset_vcn_is_supported = smu_v13_0_6_reset_vcn_is_supported,
        .post_init = smu_v13_0_6_post_init,
 };