drm/amdgpu: enable VCN/JPEG CGPG for GC IP version 11.5.3

Enable VCN/JPEG CGPG for ASIC with GFX version 11.5.3.

Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Signed-off-by: Tim Huang <tim.huang@amd.com>
Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index e1dad7ca5b5c457272edac44ca7c5cb1624b8920..2e86c730d19280b1a1c5b951eeeda8d6d7736766 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -782,7 +782,9 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block)
                adev->external_rev_id = adev->rev_id + 0x40;
                break;
        case IP_VERSION(11, 5, 3):
-               adev->cg_flags = AMD_CG_SUPPORT_GFX_CGCG |
+               adev->cg_flags = AMD_CG_SUPPORT_VCN_MGCG |
+                       AMD_CG_SUPPORT_JPEG_MGCG |
+                       AMD_CG_SUPPORT_GFX_CGCG |
                        AMD_CG_SUPPORT_GFX_CGLS |
                        AMD_CG_SUPPORT_GFX_MGCG |
                        AMD_CG_SUPPORT_GFX_FGCG |
@@ -800,7 +802,11 @@ static int soc21_common_early_init(struct amdgpu_ip_block *ip_block)
                        AMD_CG_SUPPORT_IH_CG |
                        AMD_CG_SUPPORT_BIF_MGCG |
                        AMD_CG_SUPPORT_BIF_LS;
-               adev->pg_flags = AMD_PG_SUPPORT_GFX_PG;
+               adev->pg_flags = AMD_PG_SUPPORT_VCN_DPG |
+                       AMD_PG_SUPPORT_VCN |
+                       AMD_PG_SUPPORT_JPEG_DPG |
+                       AMD_PG_SUPPORT_JPEG |
+                       AMD_PG_SUPPORT_GFX_PG;
                adev->external_rev_id = adev->rev_id + 0x50;
                break;
        default: