From: Yifan Zhang Date: Thu, 10 Feb 2022 19:34:43 +0000 (-0500) Subject: drm/amdgpu: add nv common init for gc 10.3.6 X-Git-Tag: v5.18-rc1~134^2~16^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1957f27de290cde5a0d6e1df46a2c8b3e9c77046;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: add nv common init for gc 10.3.6 This patch adds add nv common init for gc 10.3.6. Signed-off-by: Yifan Zhang Reviewed-by: Alex Deucher Reviewed-by: Huang Rui Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c index acd66a7b667a1..81104f7c56252 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c @@ -1177,6 +1177,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev) case IP_VERSION(10, 3, 3): case IP_VERSION(10, 3, 4): case IP_VERSION(10, 3, 5): + case IP_VERSION(10, 3, 6): case IP_VERSION(10, 3, 7): amdgpu_device_ip_block_add(adev, &nv_common_ip_block); break; diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index f1285cf645178..78a0e8882a508 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -908,6 +908,11 @@ static int nv_common_early_init(void *handle) adev->pg_flags = 0; adev->external_rev_id = adev->rev_id + 0x82; break; + case IP_VERSION(10, 3, 6): + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = adev->rev_id + 0x01; + break; case IP_VERSION(10, 3, 7): adev->cg_flags = 0; adev->pg_flags = AMD_PG_SUPPORT_VCN |