Commit 8e6e054d authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: cache psp runtime boot_cfg_bitmask in sw_int 



PSP runtime boot_cfg_bitmask carries various psp bl
feature bit mask that can be used by driver. Cache
it in sw_init for further usage.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3d689ae4

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

+7 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ static int psp_sw_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct psp_context *psp = &adev->psp;

	int ret;

	struct psp_runtime_boot_cfg_entry boot_cfg_entry;



	if (!amdgpu_sriov_vf(adev)) {

		ret = psp_init_microcode(psp);
@@ -259,6 +260,12 @@ static int psp_sw_init(void *handle) 
		}

	}



	memset(&boot_cfg_entry, 0, sizeof(boot_cfg_entry));

	if (psp_get_runtime_db_entry(adev,

				PSP_RUNTIME_ENTRY_TYPE_BOOT_CONFIG,

				&boot_cfg_entry))

		psp->boot_cfg_bitmask = boot_cfg_entry.boot_cfg_bitmask;



	ret = psp_memory_training_init(psp);

	if (ret) {

		DRM_ERROR("Failed to initialize memory training!\n");

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

+2 −0
Original line number Diff line number Diff line
@@ -379,6 +379,8 @@ struct psp_context 
	struct psp_securedisplay_context	securedisplay_context;

	struct mutex			mutex;

	struct psp_memory_training_context mem_train_ctx;



	uint32_t			boot_cfg_bitmask;

};



struct amdgpu_psp_funcs {