diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-01-25 02:35:53 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-01-25 02:35:53 +0000 |
| commit | 23ac2ee9ad260e78add8e8ecc8fc084f1c22b86e (patch) | |
| tree | b579bece3c993df90d84c160e3c7b558a0b9617c | |
| parent | c23f39f34a74f562048394e7fa0d04e658d6dd18 (diff) | |
drm/amdgpu: enable PSP IP v13.0.11 support
From Tim Huang
8cbe04b2e0a1a0197a47e14fbbbcf0ef18299bce in linux-6.1.y/6.1.8
2c83e3fd928b9cb1e35340e58d4b1bd2eea23ed6 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c | 1 | ||||
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/psp_v13_0.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c index e1c3a748f85..a5afdd6fa56 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c @@ -139,6 +139,7 @@ static int psp_early_init(void *handle) case IP_VERSION(13, 0, 5): case IP_VERSION(13, 0, 8): case IP_VERSION(13, 0, 10): + case IP_VERSION(13, 0, 11): psp_v13_0_set_psp_funcs(psp); psp->autoload_supported = true; break; diff --git a/sys/dev/pci/drm/amd/amdgpu/psp_v13_0.c b/sys/dev/pci/drm/amd/amdgpu/psp_v13_0.c index dea51dddca8..938d0e6914b 100644 --- a/sys/dev/pci/drm/amd/amdgpu/psp_v13_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/psp_v13_0.c @@ -46,6 +46,8 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_7_sos.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_7_ta.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_10_sos.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_10_ta.bin"); +MODULE_FIRMWARE("amdgpu/psp_13_0_11_toc.bin"); +MODULE_FIRMWARE("amdgpu/psp_13_0_11_ta.bin"); /* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240 @@ -102,6 +104,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp) case IP_VERSION(13, 0, 3): case IP_VERSION(13, 0, 5): case IP_VERSION(13, 0, 8): + case IP_VERSION(13, 0, 11): err = psp_init_toc_microcode(psp, chip_name); if (err) return err; |