Skip to content

Commit aee6836

Browse files
prliangpubalexdeucher
authored andcommitted
drm/amdgpu: add soc15 common ip block support for green_sardine (v3)
This patch adds common ip support for green_sardine. v2: use apu flags, squash in CG/PG enablement v3: rebase Signed-off-by: Prike Liang <Prike.Liang@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent c38577a commit aee6836

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

drivers/gpu/drm/amd/amdgpu/soc15.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,15 @@ static int soc15_common_early_init(void *handle)
12421242
break;
12431243
case CHIP_RENOIR:
12441244
adev->asic_funcs = &soc15_asic_funcs;
1245-
adev->apu_flags |= AMD_APU_IS_RENOIR;
1245+
if (adev->pdev->device == 0x1636)
1246+
adev->apu_flags |= AMD_APU_IS_RENOIR;
1247+
else
1248+
adev->apu_flags |= AMD_APU_IS_GREEN_SARDINE;
1249+
1250+
if (adev->apu_flags & AMD_APU_IS_RENOIR)
1251+
adev->external_rev_id = adev->rev_id + 0x91;
1252+
else
1253+
adev->external_rev_id = adev->rev_id + 0xa1;
12461254
adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |
12471255
AMD_CG_SUPPORT_GFX_MGLS |
12481256
AMD_CG_SUPPORT_GFX_3D_CGCG |
@@ -1267,7 +1275,6 @@ static int soc15_common_early_init(void *handle)
12671275
AMD_PG_SUPPORT_VCN |
12681276
AMD_PG_SUPPORT_JPEG |
12691277
AMD_PG_SUPPORT_VCN_DPG;
1270-
adev->external_rev_id = adev->rev_id + 0x91;
12711278
break;
12721279
default:
12731280
/* FIXME: not supported yet */

0 commit comments

Comments
 (0)