drm/amdgpu: disable gfxoff on original raven

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdgpu / gfx_v9_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 3ebd5c20dfd3ca901f27a2cbf874f2ea6476707b..3e4ac2f06c3b958f1d38e17695818e22efac80ec 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1051,8 +1051,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) ||