aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <ckoenig.leichtzumerken@gmail.com>2018-10-24 08:59:10 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-11-01 10:56:56 -0400
commit9d064be1e6a195eaaa3762af5c7c6cd3f66aa6cc (patch)
treea2c2c8b5dfa6a83dd710c687c01a4932d0061f2a
parenta4c3f247ee94945ac949f3280b7c050c712857cd (diff)
drm/amdgpu: revert "enable gfxoff in non-sriov and stutter mode by default"
This is still completely breaking my Raven system. This reverts commit cdf2f910fa969adca1b0e3ad2b487821233dc038. Revert until we sort out the sbios and firmware combinations that work correctly. bug: https://bugs.freedesktop.org/show_bug.cgi?id=108606 Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index f06d068b8eb5..30bc345d6fdf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1493,8 +1493,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
1493 } 1493 }
1494 1494
1495 adev->powerplay.pp_feature = amdgpu_pp_feature_mask; 1495 adev->powerplay.pp_feature = amdgpu_pp_feature_mask;
1496 if (amdgpu_sriov_vf(adev))
1497 adev->powerplay.pp_feature &= ~PP_GFXOFF_MASK;
1498 1496
1499 for (i = 0; i < adev->num_ip_blocks; i++) { 1497 for (i = 0; i < adev->num_ip_blocks; i++) {
1500 if ((amdgpu_ip_block_mask & (1 << i)) == 0) { 1498 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
index 28781414d71c..943dbf3c5da1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -114,8 +114,8 @@ uint amdgpu_pg_mask = 0xffffffff;
114uint amdgpu_sdma_phase_quantum = 32; 114uint amdgpu_sdma_phase_quantum = 32;
115char *amdgpu_disable_cu = NULL; 115char *amdgpu_disable_cu = NULL;
116char *amdgpu_virtual_display = NULL; 116char *amdgpu_virtual_display = NULL;
117/* OverDrive(bit 14) disabled by default*/ 117/* OverDrive(bit 14),gfxoff(bit 15),stutter mode(bit 17) disabled by default*/
118uint amdgpu_pp_feature_mask = 0xffffbfff; 118uint amdgpu_pp_feature_mask = 0xfffd3fff;
119int amdgpu_ngg = 0; 119int amdgpu_ngg = 0;
120int amdgpu_prim_buf_per_se = 0; 120int amdgpu_prim_buf_per_se = 0;
121int amdgpu_pos_buf_per_se = 0; 121int amdgpu_pos_buf_per_se = 0;