From: Xiangliang Yu <Xiangliang.Yu@amd.com>
Date: Wed, 18 Jan 2017 04:50:14 +0000 (+0800)
Subject: drm/amdgpu/vi: fix mailbox irq mistake
X-Git-Tag: v4.11-rc1~83^2~31^2~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63d24f8846b0095cbbd94746b6fc8a6acbda8f5e;p=karo-tx-linux.git

drm/amdgpu/vi: fix mailbox irq mistake

For virt, freed mailbox irq should be handled in hw fini, not hw
init. Correct it.

Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 16202444040b..4922fff08c3c 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1135,9 +1135,6 @@ static int vi_common_hw_init(void *handle)
 	/* enable the doorbell aperture */
 	vi_enable_doorbell_aperture(adev, true);
 
-	if (amdgpu_sriov_vf(adev))
-		xgpu_vi_mailbox_put_irq(adev);
-
 	return 0;
 }
 
@@ -1148,6 +1145,9 @@ static int vi_common_hw_fini(void *handle)
 	/* enable the doorbell aperture */
 	vi_enable_doorbell_aperture(adev, false);
 
+	if (amdgpu_sriov_vf(adev))
+		xgpu_vi_mailbox_put_irq(adev);
+
 	return 0;
 }