aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
diff options
context:
space:
mode:
authorHuang Rui <ray.huang@amd.com>2016-11-01 03:35:38 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:54:33 -0400
commite635ee07456ac686b3c26ab3c5735936faebfb2e (patch)
tree7bca30692c4879c9436134ab3fad8a27b6c0f09d /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
parent70170d146d0f8d6df6c1edafa70cf983027f7a6e (diff)
drm/amdgpu: use new flag to handle different firmware loading method
This patch introduces a new flag named "amdgpu_firmware_load_type" to handle different firmware loading method. Since Vega10, there are three ways to load firmware. It would be better to use a flag and a fw_load_type kernel parameter to configure it. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Huang Rui <ray.huang@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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 778d16f835ab..7292f4e7bb1a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -80,7 +80,7 @@ int amdgpu_pcie_gen2 = -1;
80int amdgpu_msi = -1; 80int amdgpu_msi = -1;
81int amdgpu_lockup_timeout = 0; 81int amdgpu_lockup_timeout = 0;
82int amdgpu_dpm = -1; 82int amdgpu_dpm = -1;
83int amdgpu_smc_load_fw = 1; 83int amdgpu_fw_load_type = -1;
84int amdgpu_aspm = -1; 84int amdgpu_aspm = -1;
85int amdgpu_runtime_pm = -1; 85int amdgpu_runtime_pm = -1;
86unsigned amdgpu_ip_block_mask = 0xffffffff; 86unsigned amdgpu_ip_block_mask = 0xffffffff;
@@ -140,8 +140,8 @@ module_param_named(lockup_timeout, amdgpu_lockup_timeout, int, 0444);
140MODULE_PARM_DESC(dpm, "DPM support (1 = enable, 0 = disable, -1 = auto)"); 140MODULE_PARM_DESC(dpm, "DPM support (1 = enable, 0 = disable, -1 = auto)");
141module_param_named(dpm, amdgpu_dpm, int, 0444); 141module_param_named(dpm, amdgpu_dpm, int, 0444);
142 142
143MODULE_PARM_DESC(smc_load_fw, "SMC firmware loading(1 = enable, 0 = disable)"); 143MODULE_PARM_DESC(fw_load_type, "firmware loading type (0 = direct, 1 = SMU, 2 = PSP, -1 = auto)");
144module_param_named(smc_load_fw, amdgpu_smc_load_fw, int, 0444); 144module_param_named(fw_load_type, amdgpu_fw_load_type, int, 0444);
145 145
146MODULE_PARM_DESC(aspm, "ASPM support (1 = enable, 0 = disable, -1 = auto)"); 146MODULE_PARM_DESC(aspm, "ASPM support (1 = enable, 0 = disable, -1 = auto)");
147module_param_named(aspm, amdgpu_aspm, int, 0444); 147module_param_named(aspm, amdgpu_aspm, int, 0444);