From: Tao Zhou <tao.zhou1@amd.com>
Date: Tue, 1 Jun 2021 09:06:44 +0000 (+0800)
Subject: drm/amdgpu: add nbio support for cyan_skillfish
X-Git-Tag: v5.15-rc1~148^2~15^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=338b3cf0b9f8e122fc8257133c06aa92ad5ab9b0;p=thirdparty%2Fkernel%2Flinux.git

drm/amdgpu: add nbio support for cyan_skillfish

nbio version is 2.3.

v2: Make it more explicit (Alex)

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 045a26b1594e6..5e4f763263157 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -685,7 +685,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
 {
 	int r;
 
-	if (adev->flags & AMD_IS_APU) {
+	if (adev->asic_type == CHIP_CYAN_SKILLFISH) {
+		adev->nbio.funcs = &nbio_v2_3_funcs;
+		adev->nbio.hdp_flush_reg = &nbio_v2_3_hdp_flush_reg;
+	} else if (adev->flags & AMD_IS_APU) {
 		adev->nbio.funcs = &nbio_v7_2_funcs;
 		adev->nbio.hdp_flush_reg = &nbio_v7_2_hdp_flush_reg;
 	} else {