drm/amd/swsmu: add missing feature map for sienna_cichlid

commit d48d7484d8dca1d4577fc53f1f826e68420d00eb upstream.

it will cause smu sysfs node of "pp_features" show error.

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.9.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_types.h b/drivers/gpu/drm/amd/powerplay/inc/smu_types.h
index 7b585e205a5a07cfa632fbee35b91a4ab125c1bf..3b868f2adc12f1e84932583680ad9994dded1fcd 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu_types.h
@@ -217,6 +217,7 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(DPM_MP0CLK),                            \
        __SMU_DUMMY_MAP(DPM_LINK),                              \
        __SMU_DUMMY_MAP(DPM_DCEFCLK),                           \
+       __SMU_DUMMY_MAP(DPM_XGMI),                      \
        __SMU_DUMMY_MAP(DS_GFXCLK),                             \
        __SMU_DUMMY_MAP(DS_SOCCLK),                             \
        __SMU_DUMMY_MAP(DS_LCLK),                               \

diff --git a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
index f2844943f6b7b2c45e01d58b48b6766f65764212..8f41496630a52c85146f26d0a2c0060552171285 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
@@ -150,14 +150,17 @@ static struct cmn2asic_mapping sienna_cichlid_feature_mask_map[SMU_FEATURE_COUNT
        FEA_MAP(DPM_GFXCLK),
        FEA_MAP(DPM_GFX_GPO),
        FEA_MAP(DPM_UCLK),
+       FEA_MAP(DPM_FCLK),
        FEA_MAP(DPM_SOCCLK),
        FEA_MAP(DPM_MP0CLK),
        FEA_MAP(DPM_LINK),
        FEA_MAP(DPM_DCEFCLK),
+       FEA_MAP(DPM_XGMI),
        FEA_MAP(MEM_VDDCI_SCALING),
        FEA_MAP(MEM_MVDD_SCALING),
        FEA_MAP(DS_GFXCLK),
        FEA_MAP(DS_SOCCLK),
+       FEA_MAP(DS_FCLK),
        FEA_MAP(DS_LCLK),
        FEA_MAP(DS_DCEFCLK),
        FEA_MAP(DS_UCLK),