From e0052b6c488f10357f71ce3bc86aee5ad6c1fef2 Mon Sep 17 00:00:00 2001 From: Raveendra Talabattula Date: Thu, 6 Sep 2018 14:56:19 +0800 Subject: [PATCH 5764/5765] Revert drm/amdgpu:enable gfxoff in non-sriov and stutter mode by default This patch is causing system hang randomly when S3 is performed with playback Change-Id: I91a5db7cabbfa66d97bfb522a671a12695b51b22 Signed-off-by: Kenneth Feng Signed-off-by: Alex Deucher Signed-off-by: Raveendra Talabattula --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c old mode 100755 new mode 100644 index ef0fc426d125..ef7b92235f8b --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1520,8 +1520,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) } adev->powerplay.pp_feature = amdgpu_pp_feature_mask; - if (amdgpu_sriov_vf(adev)) - adev->powerplay.pp_feature &= ~PP_GFXOFF_MASK; for (i = 0; i < adev->num_ip_blocks; i++) { if ((amdgpu_ip_block_mask & (1 << i)) == 0) { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c old mode 100755 new mode 100644 index da922c6bcf53..8af64fda53f8 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -120,8 +120,8 @@ uint amdgpu_pg_mask = 0xffffffff; uint amdgpu_sdma_phase_quantum = 32; char *amdgpu_disable_cu = NULL; char *amdgpu_virtual_display = NULL; -/* OverDrive(bit 14) disabled by default*/ -uint amdgpu_pp_feature_mask = 0xffffbfff; +/* OverDrive(bit 14),gfxoff(bit 15),stutter mode(bit 17) disabled by default*/ +uint amdgpu_pp_feature_mask = 0xfffd3fff; int amdgpu_ngg = 0; int amdgpu_prim_buf_per_se = 0; int amdgpu_pos_buf_per_se = 0; -- 2.17.1