drm/amdgpu: disable gfxoff on original raven

There are still combinations of sbios and firmware that
are not stable.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=204689
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index dfca83a2de47ecde430b47e191c06372354e52ca..97cf0b53687373b44e4ee977b78016453edfe17c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1038,8 +1038,13 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)
        case CHIP_VEGA20:
                break;
        case CHIP_RAVEN:
-               if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
-                       &&((adev->gfx.rlc_fw_version != 106 &&
+               /* Disable GFXOFF on original raven.  There are combinations
+                * of sbios and platforms that are not stable.
+                */
+               if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8))
+                       adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
+               else if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
+                        &&((adev->gfx.rlc_fw_version != 106 &&
                             adev->gfx.rlc_fw_version < 531) ||
                            (adev->gfx.rlc_fw_version == 53815) ||
                            (adev->gfx.rlc_feature_version < 1) ||