summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYifan Zhang <yifan1.zhang@amd.com>2022-02-10 14:34:43 -0500
committerAlex Deucher <alexander.deucher@amd.com>2022-02-17 15:59:05 -0500
commit1957f27de290cde5a0d6e1df46a2c8b3e9c77046 (patch)
tree327f2a1074a33d77e94ed345a08555505564ead9 /drivers
parent91aa9c8f5282922b2890227724467de2f32fbf84 (diff)
downloadlinux-stable-1957f27de290cde5a0d6e1df46a2c8b3e9c77046.tar.gz
linux-stable-1957f27de290cde5a0d6e1df46a2c8b3e9c77046.tar.bz2
linux-stable-1957f27de290cde5a0d6e1df46a2c8b3e9c77046.zip
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 <yifan1.zhang@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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/nv.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index acd66a7b667a..81104f7c5625 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 f1285cf64517..78a0e8882a50 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 |