From: Hawking Zhang <Hawking.Zhang@amd.com>
Date: Tue, 1 Dec 2020 15:20:55 +0000 (+0800)
Subject: drm/amdgpu: switch to ih_init_register_offset for navi10
X-Git-Tag: v5.12-rc1~132^2~18^2~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a362976bf20957ef3bd74b2b3b9fd2d5a44fbb55;p=thirdparty%2Fkernel%2Flinux.git

drm/amdgpu: switch to ih_init_register_offset for navi10

Initialize ih control registers offset through helper
function navi10_ih_init_register_offset.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Dennis Li <Dennis.Li@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
index 786f15f829e94..35bd6d210135c 100644
--- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
@@ -847,6 +847,9 @@ static int navi10_ih_sw_init(void *handle)
 					(adev->doorbell_index.ih + 2) << 1;
 	}
 
+	/* initialize ih control registers offset */
+	navi10_ih_init_register_offset(adev);
+
 	r = amdgpu_ih_ring_init(adev, &adev->irq.ih_soft, PAGE_SIZE, true);
 	if (r)
 		return r;