Skip to contentSkip to conversation

drm/amdgpu: Navi12 SRIOV VF doesn't load TOC

PATCH In review [email protected] 2 participants 2 messages Sep 12, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: Navi12 SRIOV VF doesn't load TOC

From: Jiange Zhao <[email protected]>

In SRIOV case, the autoload sequence is the same

as bare metal, except VF won't load TOC.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -4
index f90a0cd12827..762c97ce8251 100644
@@ -253,7 +253,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);
@@ -1305,9 +1306,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;
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reviewed-by Emily Deng
#2 lore raw
Quoted 46 lines

-----Original Message-----
From: Zhao, Jiange <[email protected]>
Sent: Thursday, September 12, 2019 1:22 PM
To: [email protected]
Cc: Nieto, David M <[email protected]>; Deng, Emily <[email protected]>; Koenig, Christian <[email protected]>; Zhao, Jiange <[email protected]>
Subject: [PATCH] drm/amdgpu: Navi12 SRIOV VF doesn't load TOC

From: Jiange Zhao <[email protected]>

In SRIOV case, the autoload sequence is the same

as bare metal, except VF won't load TOC.

---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -5
index f90a0cd12827..762c97ce8251 100644
@@ -253,7 +253,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);
@@ -1305,9 +1306,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;
--
Quoted 1 line

2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx