drm/amdgpu: add vangogh apu flag
authorHuang Rui <ray.huang@amd.com>
Mon, 26 Oct 2020 12:43:41 +0000 (20:43 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 27 Oct 2020 16:01:29 +0000 (12:01 -0400)
This patch is to add vangogh apu flag to support more kickers that
belongs vangogh series.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/nv.c
drivers/gpu/drm/amd/include/amd_shared.h

index 30ec826c8760423337eaee346145d773a469c807..b7fc9ebdf1c15a0d3966b4058d899fe261d56c89 100644 (file)
@@ -941,6 +941,7 @@ static int nv_common_early_init(void *handle)
                break;
 
        case CHIP_VANGOGH:
+               adev->apu_flags |= AMD_APU_IS_VANGOGH;
                adev->cg_flags = AMD_CG_SUPPORT_GFX_CGCG |
                        AMD_CG_SUPPORT_GFX_CGLS |
                        AMD_CG_SUPPORT_GFX_3D_CGCG |
@@ -951,7 +952,8 @@ static int nv_common_early_init(void *handle)
                        AMD_PG_SUPPORT_VCN |
                        AMD_PG_SUPPORT_VCN_DPG |
                        AMD_PG_SUPPORT_JPEG;
-               adev->external_rev_id = adev->rev_id + 0x01;
+               if (adev->apu_flags & AMD_APU_IS_VANGOGH)
+                       adev->external_rev_id = adev->rev_id + 0x01;
                break;
        case CHIP_DIMGREY_CAVEFISH:
                adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |
index 06c1aabf10cef840355453f08467cd220e7de8fc..412602d84f7110f34ac0bc62ae5a365e579ef27c 100644 (file)
@@ -46,6 +46,7 @@ enum amd_apu_flags {
        AMD_APU_IS_PICASSO = 0x00000004UL,
        AMD_APU_IS_RENOIR = 0x00000008UL,
        AMD_APU_IS_GREEN_SARDINE = 0x00000010UL,
+       AMD_APU_IS_VANGOGH = 0x00000020UL,
 };
 
 /**