Skip to content

Commit 6c5683b

Browse files
lema1-devalexdeucher
authored andcommitted
Revert "drm/amdgpu: add param to specify fw bo location for front-door loading"
This reverts commit c572abf. Will use debug module param instead of independent module param. Signed-off-by: Le Ma <le.ma@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 7073934 commit 6c5683b

4 files changed

Lines changed: 2 additions & 10 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ extern int amdgpu_agp;
254254

255255
extern int amdgpu_wbrf;
256256

257-
extern int fw_bo_location;
258-
259257
#define AMDGPU_VM_MAX_NUM_CTX 4096
260258
#define AMDGPU_SG_THRESHOLD (256*1024*1024)
261259
#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ int amdgpu_seamless = -1; /* auto */
210210
uint amdgpu_debug_mask;
211211
int amdgpu_agp = -1; /* auto */
212212
int amdgpu_wbrf = -1;
213-
int fw_bo_location = -1;
214213

215214
static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
216215

@@ -990,10 +989,6 @@ MODULE_PARM_DESC(wbrf,
990989
"Enable Wifi RFI interference mitigation (0 = disabled, 1 = enabled, -1 = auto(default)");
991990
module_param_named(wbrf, amdgpu_wbrf, int, 0444);
992991

993-
MODULE_PARM_DESC(fw_bo_location,
994-
"location to put firmware bo for frontdoor loading (-1 = auto (default), 0 = on ram, 1 = on vram");
995-
module_param(fw_bo_location, int, 0644);
996-
997992
/* These devices are not supported by amdgpu.
998993
* They are supported by the mach64, r128, radeon drivers
999994
*/

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ static int psp_sw_init(void *handle)
466466
}
467467

468468
ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
469-
(amdgpu_sriov_vf(adev) || fw_bo_location == 1) ?
469+
amdgpu_sriov_vf(adev) ?
470470
AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
471471
&psp->fw_pri_bo,
472472
&psp->fw_pri_mc_addr,

drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,8 +1062,7 @@ int amdgpu_ucode_create_bo(struct amdgpu_device *adev)
10621062
{
10631063
if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT) {
10641064
amdgpu_bo_create_kernel(adev, adev->firmware.fw_size, PAGE_SIZE,
1065-
(amdgpu_sriov_vf(adev) || fw_bo_location == 1) ?
1066-
AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
1065+
amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
10671066
&adev->firmware.fw_buf,
10681067
&adev->firmware.fw_buf_mc,
10691068
&adev->firmware.fw_buf_ptr);

0 commit comments

Comments
 (0)