diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2015-08-13 13:20:20 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:51:19 -0400 |
commit | a895c222e7ab5f50ec10e209cd4548ecd5dd9443 (patch) | |
tree | d4d8874de8be3ee2ffd81282c805a46163ff9227 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
parent | a8f5bf0b220c28b1b600a5ff3cae0b53c5c2079b (diff) |
drm/amdgpu: disable GPU reset by default
It's not validated yet and causes more harm than good.
Avoids spurious resets.
Reviewed-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 8bb5610c2d25..e6fa27805207 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
@@ -63,7 +63,7 @@ int amdgpu_disp_priority = 0; | |||
63 | int amdgpu_hw_i2c = 0; | 63 | int amdgpu_hw_i2c = 0; |
64 | int amdgpu_pcie_gen2 = -1; | 64 | int amdgpu_pcie_gen2 = -1; |
65 | int amdgpu_msi = -1; | 65 | int amdgpu_msi = -1; |
66 | int amdgpu_lockup_timeout = 10000; | 66 | int amdgpu_lockup_timeout = 0; |
67 | int amdgpu_dpm = -1; | 67 | int amdgpu_dpm = -1; |
68 | int amdgpu_smc_load_fw = 1; | 68 | int amdgpu_smc_load_fw = 1; |
69 | int amdgpu_aspm = -1; | 69 | int amdgpu_aspm = -1; |
@@ -106,7 +106,7 @@ module_param_named(pcie_gen2, amdgpu_pcie_gen2, int, 0444); | |||
106 | MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)"); | 106 | MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)"); |
107 | module_param_named(msi, amdgpu_msi, int, 0444); | 107 | module_param_named(msi, amdgpu_msi, int, 0444); |
108 | 108 | ||
109 | MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (defaul 10000 = 10 seconds, 0 = disable)"); | 109 | MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (default 0 = disable)"); |
110 | module_param_named(lockup_timeout, amdgpu_lockup_timeout, int, 0444); | 110 | module_param_named(lockup_timeout, amdgpu_lockup_timeout, int, 0444); |
111 | 111 | ||
112 | MODULE_PARM_DESC(dpm, "DPM support (1 = enable, 0 = disable, -1 = auto)"); | 112 | MODULE_PARM_DESC(dpm, "DPM support (1 = enable, 0 = disable, -1 = auto)"); |