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

drm/amdgpu: add debug flag to place fw bo on vram for frontdoor loading 



Use debug_mask=0x8 param to help isolating data path issues
on new systems in early phase.

v2: rename the flag for explicitness (lijo)

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 6c5683bd

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

+1 −0
Original line number Diff line number Diff line
@@ -1144,6 +1144,7 @@ struct amdgpu_device { 
	bool                            debug_vm;

	bool                            debug_largebar;

	bool                            debug_disable_soft_recovery;

	bool                            debug_use_vram_fw_buf;

};



static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev,

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

+6 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ enum AMDGPU_DEBUG_MASK { 
	AMDGPU_DEBUG_VM = BIT(0),

	AMDGPU_DEBUG_LARGEBAR = BIT(1),

	AMDGPU_DEBUG_DISABLE_GPU_SOFT_RECOVERY = BIT(2),

	AMDGPU_DEBUG_USE_VRAM_FW_BUF = BIT(3),

};



unsigned int amdgpu_vram_limit = UINT_MAX;
@@ -2117,6 +2118,11 @@ static void amdgpu_init_debug_options(struct amdgpu_device *adev) 
		pr_info("debug: soft reset for GPU recovery disabled\n");

		adev->debug_disable_soft_recovery = true;

	}



	if (amdgpu_debug_mask & AMDGPU_DEBUG_USE_VRAM_FW_BUF) {

		pr_info("debug: place fw in vram for frontdoor loading\n");

		adev->debug_use_vram_fw_buf = true;

	}

}



static unsigned long amdgpu_fix_asic_type(struct pci_dev *pdev, unsigned long flags)

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) ?

				      (amdgpu_sriov_vf(adev) || adev->debug_use_vram_fw_buf) ?

				      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

+2 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,8 @@ 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) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,

			(amdgpu_sriov_vf(adev) || adev->debug_use_vram_fw_buf) ?

			AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,

			&adev->firmware.fw_buf,

			&adev->firmware.fw_buf_mc,

			&adev->firmware.fw_buf_ptr);