aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3791-drm-amdgpu-SRIOV-Navi12-SRIOV-VF-doesn-t-load-TOC.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3791-drm-amdgpu-SRIOV-Navi12-SRIOV-VF-doesn-t-load-TOC.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3791-drm-amdgpu-SRIOV-Navi12-SRIOV-VF-doesn-t-load-TOC.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3791-drm-amdgpu-SRIOV-Navi12-SRIOV-VF-doesn-t-load-TOC.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3791-drm-amdgpu-SRIOV-Navi12-SRIOV-VF-doesn-t-load-TOC.patch
new file mode 100644
index 00000000..f5c6e568
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3791-drm-amdgpu-SRIOV-Navi12-SRIOV-VF-doesn-t-load-TOC.patch
@@ -0,0 +1,42 @@
+From 759031f97bebc5a09fb385900937c736ebca3e4c Mon Sep 17 00:00:00 2001
+From: Jiange Zhao <Jiange.Zhao@amd.com>
+Date: Thu, 12 Sep 2019 13:18:41 +0800
+Subject: [PATCH 3791/4256] drm/amdgpu/SRIOV: Navi12 SRIOV VF doesn't load TOC
+
+In SRIOV case, the autoload sequence is the same
+
+as bare metal, except VF won't load TOC.
+
+Signed-off-by: Jiange Zhao <Jiange.Zhao@amd.com>
+Reviewed-by: Emily Deng <Emily.Deng@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+index a49b4ccd611e..b954b48f3ddf 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+@@ -255,7 +255,8 @@ static int psp_tmr_init(struct psp_context *psp)
+
+ /* For ASICs support RLC autoload, psp will parse the toc
+ * and calculate the total size of TMR needed */
+- if (psp->toc_start_addr &&
++ if (!amdgpu_sriov_vf(psp->adev) &&
++ psp->toc_start_addr &&
+ psp->toc_bin_size &&
+ psp->fw_pri_buf) {
+ ret = psp_load_toc(psp, &tmr_size);
+@@ -1307,9 +1308,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
+ int ret;
+ struct psp_gfx_cmd_resp *cmd;
+
+- if (amdgpu_sriov_vf(psp->adev))
+- return 0;
+-
+ cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
+ if (!cmd)
+ return -ENOMEM;
+--
+2.17.1
+