From: Likun Gao <Likun.Gao@amd.com>
Date: Mon, 5 Aug 2019 07:32:40 +0000 (+0800)
Subject: drm/amdgpu: skip for reroute ih for sienna_cichlid psp ring init currently
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=64f2d805a1783def6a3abf4c985f6d69c4ebb8ef;p=linux.git

drm/amdgpu: skip for reroute ih for sienna_cichlid psp ring init currently

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Jack Xiao <Jack.Xiao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 349fc6f2de123..234ba127ec2e7 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -363,7 +363,8 @@ static int psp_v11_0_ring_init(struct psp_context *psp,
 	struct psp_ring *ring;
 	struct amdgpu_device *adev = psp->adev;
 
-	if (!amdgpu_sriov_vf(adev))
+	if ((!amdgpu_sriov_vf(adev)) &&
+	    (adev->asic_type != CHIP_SIENNA_CICHLID))
 		psp_v11_0_reroute_ih(psp);
 
 	ring = &psp->km_ring;