drm/amdgpu: skip reroute ih for some ASICs
authorTao Zhou <tao.zhou1@amd.com>
Tue, 28 Jul 2020 05:53:48 +0000 (13:53 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 12 Oct 2020 18:01:14 +0000 (14:01 -0400)
Add check before reroute ih setting, it's not supported by some ASICs.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c

index 1a69c21..993846f 100644 (file)
@@ -438,8 +438,8 @@ static int psp_v11_0_ring_init(struct psp_context *psp,
        struct amdgpu_device *adev = psp->adev;
 
        if ((!amdgpu_sriov_vf(adev)) &&
-           (adev->asic_type != CHIP_SIENNA_CICHLID) &&
-           (adev->asic_type != CHIP_NAVY_FLOUNDER))
+           !(adev->asic_type >= CHIP_SIENNA_CICHLID &&
+           adev->asic_type <= CHIP_DIMGREY_CAVEFISH))
                psp_v11_0_reroute_ih(psp);
 
        ring = &psp->km_ring;