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: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 0f219d4ccf014cf911e686d67387ad2ef757081d..284a2aa347954a3aef9448c4e3eff1d8e557ed2c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -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");

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 1d9fa4f4bc2989af7efdf3e81f3885e11b60d68b..45b27c9eb89269f2bb6e2d6a79c6c787689731b6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -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 {