diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2017-06-30 04:36:07 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-07-04 12:07:53 -0400 |
commit | 53efaf562af31142d57c3c56b10f2c88ebb215f7 (patch) | |
tree | b47e0d0c6f85467afd2b23550985c92fb36f1d73 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
parent | 7b8d925d5cd3c3497a041d514de1739e2a2d24ef (diff) |
amdgpu: Set cik/si_support to 1 by default if radeon isn't built
It was required to explicitly set these parameters to 1, even if the
radeon driver isn't built at all, which is not intuitive.
Reported-by: Shawn Starr <shawn.starr@rogers.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index aef43b5334af..b59f37c83fa6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
@@ -248,14 +248,28 @@ MODULE_PARM_DESC(lbpw, "Load Balancing Per Watt (LBPW) support (1 = enable, 0 = | |||
248 | module_param_named(lbpw, amdgpu_lbpw, int, 0444); | 248 | module_param_named(lbpw, amdgpu_lbpw, int, 0444); |
249 | 249 | ||
250 | #ifdef CONFIG_DRM_AMDGPU_SI | 250 | #ifdef CONFIG_DRM_AMDGPU_SI |
251 | |||
252 | #if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE) | ||
251 | int amdgpu_si_support = 0; | 253 | int amdgpu_si_support = 0; |
252 | MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))"); | 254 | MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))"); |
255 | #else | ||
256 | int amdgpu_si_support = 1; | ||
257 | MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)"); | ||
258 | #endif | ||
259 | |||
253 | module_param_named(si_support, amdgpu_si_support, int, 0444); | 260 | module_param_named(si_support, amdgpu_si_support, int, 0444); |
254 | #endif | 261 | #endif |
255 | 262 | ||
256 | #ifdef CONFIG_DRM_AMDGPU_CIK | 263 | #ifdef CONFIG_DRM_AMDGPU_CIK |
264 | |||
265 | #if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE) | ||
257 | int amdgpu_cik_support = 0; | 266 | int amdgpu_cik_support = 0; |
258 | MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))"); | 267 | MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))"); |
268 | #else | ||
269 | int amdgpu_cik_support = 1; | ||
270 | MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)"); | ||
271 | #endif | ||
272 | |||
259 | module_param_named(cik_support, amdgpu_cik_support, int, 0444); | 273 | module_param_named(cik_support, amdgpu_cik_support, int, 0444); |
260 | #endif | 274 | #endif |
261 | 275 | ||