Commit 6c5683bd authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

Revert "drm/amdgpu: add param to specify fw bo location for front-door loading" 



This reverts commit c572abff.

Will use debug module param instead of independent module param.

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7073934f

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

+0 −2
Original line number Diff line number Diff line
@@ -254,8 +254,6 @@ extern int amdgpu_agp; 


extern int amdgpu_wbrf;



extern int fw_bo_location;



#define AMDGPU_VM_MAX_NUM_CTX			4096

#define AMDGPU_SG_THRESHOLD			(256*1024*1024)

#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000

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

+0 −5
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ int amdgpu_seamless = -1; /* auto */ 
uint amdgpu_debug_mask;

int amdgpu_agp = -1; /* auto */

int amdgpu_wbrf = -1;

int fw_bo_location = -1;



static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
@@ -990,10 +989,6 @@ MODULE_PARM_DESC(wbrf, 
	"Enable Wifi RFI interference mitigation (0 = disabled, 1 = enabled, -1 = auto(default)");

module_param_named(wbrf, amdgpu_wbrf, int, 0444);



MODULE_PARM_DESC(fw_bo_location,

	"location to put firmware bo for frontdoor loading (-1 = auto (default), 0 = on ram, 1 = on vram");

module_param(fw_bo_location, int, 0644);



/* These devices are not supported by amdgpu.

 * They are supported by the mach64, r128, radeon drivers

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int psp_sw_init(void *handle) 
	}



	ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,

				      (amdgpu_sriov_vf(adev) || fw_bo_location == 1) ?

				      amdgpu_sriov_vf(adev) ?

				      AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,

				      &psp->fw_pri_bo,

				      &psp->fw_pri_mc_addr,

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

+1 −2
Original line number Diff line number Diff line
@@ -1062,8 +1062,7 @@ int amdgpu_ucode_create_bo(struct amdgpu_device *adev) 
{

	if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT) {

		amdgpu_bo_create_kernel(adev, adev->firmware.fw_size, PAGE_SIZE,

			(amdgpu_sriov_vf(adev) || fw_bo_location == 1) ?

			AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,

			amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,

			&adev->firmware.fw_buf,

			&adev->firmware.fw_buf_mc,

			&adev->firmware.fw_buf_ptr);