diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-01-15 13:18:12 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 14:16:55 -0500 |
commit | 1c343fc9db9e17a86c0681e0a653fd65aa9243ac (patch) | |
tree | 490ca59ddc3acf54d39f6af4ffe0a4286d92a68d /drivers/gpu/drm/amd/amdgpu | |
parent | 18db89b4025a9fb71824d0ffd84594c9f6f41cec (diff) |
drm/amdgpu: drop hard_reset module parameter
It doesn't currently do anything and there's no need for it
going forward since pci config reset will be required as a
fallback even when we have fine grained reset implemented.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index cd93104b4fbb..719bce615a2b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -74,7 +74,6 @@ extern int amdgpu_dpm; | |||
74 | extern int amdgpu_smc_load_fw; | 74 | extern int amdgpu_smc_load_fw; |
75 | extern int amdgpu_aspm; | 75 | extern int amdgpu_aspm; |
76 | extern int amdgpu_runtime_pm; | 76 | extern int amdgpu_runtime_pm; |
77 | extern int amdgpu_hard_reset; | ||
78 | extern unsigned amdgpu_ip_block_mask; | 77 | extern unsigned amdgpu_ip_block_mask; |
79 | extern int amdgpu_bapm; | 78 | extern int amdgpu_bapm; |
80 | extern int amdgpu_deep_color; | 79 | extern int amdgpu_deep_color; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 8af888a2aa9f..ce79a8b605a0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
@@ -69,7 +69,6 @@ int amdgpu_dpm = -1; | |||
69 | int amdgpu_smc_load_fw = 1; | 69 | int amdgpu_smc_load_fw = 1; |
70 | int amdgpu_aspm = -1; | 70 | int amdgpu_aspm = -1; |
71 | int amdgpu_runtime_pm = -1; | 71 | int amdgpu_runtime_pm = -1; |
72 | int amdgpu_hard_reset = 0; | ||
73 | unsigned amdgpu_ip_block_mask = 0xffffffff; | 72 | unsigned amdgpu_ip_block_mask = 0xffffffff; |
74 | int amdgpu_bapm = -1; | 73 | int amdgpu_bapm = -1; |
75 | int amdgpu_deep_color = 0; | 74 | int amdgpu_deep_color = 0; |
@@ -124,9 +123,6 @@ module_param_named(aspm, amdgpu_aspm, int, 0444); | |||
124 | MODULE_PARM_DESC(runpm, "PX runtime pm (1 = force enable, 0 = disable, -1 = PX only default)"); | 123 | MODULE_PARM_DESC(runpm, "PX runtime pm (1 = force enable, 0 = disable, -1 = PX only default)"); |
125 | module_param_named(runpm, amdgpu_runtime_pm, int, 0444); | 124 | module_param_named(runpm, amdgpu_runtime_pm, int, 0444); |
126 | 125 | ||
127 | MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))"); | ||
128 | module_param_named(hard_reset, amdgpu_hard_reset, int, 0444); | ||
129 | |||
130 | MODULE_PARM_DESC(ip_block_mask, "IP Block Mask (all blocks enabled (default))"); | 126 | MODULE_PARM_DESC(ip_block_mask, "IP Block Mask (all blocks enabled (default))"); |
131 | module_param_named(ip_block_mask, amdgpu_ip_block_mask, uint, 0444); | 127 | module_param_named(ip_block_mask, amdgpu_ip_block_mask, uint, 0444); |
132 | 128 | ||