Skip to contentSkip to conversation

drm/amdgpu: extract a PSP function to execute IP FW loading commands

PATCH In review Lang Yu 4 participants 8 messages Jun 27, 2023 – Jul 7, 2023

Subsystems (2)
lore
Share & tools
lore

Lang Yu

author
#0 lore raw

PATCH 1/2 drm/amdgpu: extract a PSP function to execute IP FW loading commands

This function is more general and easy to use by more clients.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 29 +++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  6 +++++
 2 files changed, 35 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +29 -0
index a33c155dddcf..a1cb541f315f 100644
@@ -2445,6 +2445,35 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
 	return ret;
 }
 
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+				   struct amdgpu_firmware_info *ucode,
+				   uint32_t ucode_id,
+				   uint64_t cmd_buf_gpu_addr,
+				   int cmd_buf_size)
+{
+	struct amdgpu_firmware_info fw_info = {
+		.ucode_id = ucode_id,
+		.mc_addr = cmd_buf_gpu_addr,
+		.ucode_size = cmd_buf_size,
+	};
+	struct psp_context *psp = &adev->psp;
+	struct psp_gfx_cmd_resp *cmd =
+		acquire_psp_cmd_buf(psp);
+	int ret;
+
+	if (!ucode)
+		ucode = &fw_info;
+
+	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
+	if (!ret)
+		ret = psp_cmd_submit_buf(psp, ucode, cmd,
+					 psp->fence_buf_mc_addr);
+
+	release_psp_cmd_buf(psp);
+
+	return ret;
+}
+
 static int psp_execute_non_psp_fw_load(struct psp_context *psp,
 				  struct amdgpu_firmware_info *ucode)
 {
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
index 4847aacdf9dc..bd324fed6237 100644
@@ -462,6 +462,12 @@ int psp_gpu_reset(struct amdgpu_device *adev);
 int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
 			uint64_t cmd_gpu_addr, int cmd_size);
 
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+				   struct amdgpu_firmware_info *ucode,
+				   uint32_t ucode_id,
+				   uint64_t cmd_buf_gpu_addr,
+				   int cmd_buf_size);
+
 int psp_ta_init_shared_buf(struct psp_context *psp,
 				  struct ta_mem_context *mem_ctx);
 void psp_ta_free_shared_buf(struct ta_mem_context *mem_ctx);
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 drm/amdgpu: use psp_execute_load_ip_fw_cmd_buf instead

Replace the old ones with psp_execute_load_ip_fw_cmd_buf.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++---------------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c |  9 +++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h |  2 ++
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c |  4 +---
 9 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -27
index a1cb541f315f..b61963112118 100644
@@ -2474,21 +2474,11 @@ int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
 	return ret;
 }
 
-static int psp_execute_non_psp_fw_load(struct psp_context *psp,
-				  struct amdgpu_firmware_info *ucode)
+static inline
+int psp_execute_non_psp_fw_load(struct psp_context *psp,
+				struct amdgpu_firmware_info *ucode)
 {
-	int ret = 0;
-	struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
-
-	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
-	if (!ret) {
-		ret = psp_cmd_submit_buf(psp, ucode, cmd,
-					 psp->fence_buf_mc_addr);
-	}
-
-	release_psp_cmd_buf(psp);
-
-	return ret;
+	return psp_execute_load_ip_fw_cmd_buf(psp->adev, ucode, 0, 0, 0);
 }
 
 static int psp_load_smu_fw(struct psp_context *psp)
@@ -2946,19 +2936,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
 	return ret;
 }
 
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size)
-{
-	struct amdgpu_firmware_info ucode = {0};
-
-	ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
-		AMDGPU_UCODE_ID_VCN0_RAM;
-	ucode.mc_addr = cmd_gpu_addr;
-	ucode.ucode_size = cmd_size;
-
-	return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
-}
-
 int psp_ring_cmd_submit(struct psp_context *psp,
 			uint64_t cmd_buf_mc_addr,
 			uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -2
index bd324fed6237..e49984a9d570 100644
@@ -459,8 +459,6 @@ extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_inde
 			uint32_t field_val, uint32_t mask, uint32_t msec_timeout);
 
 int psp_gpu_reset(struct amdgpu_device *adev);
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size);
 
 int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
 				   struct amdgpu_firmware_info *ucode,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +9 -0
index d37ebd4402ef..1805cd042d34 100644
@@ -1257,3 +1257,12 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)
 
 	return 0;
 }
+
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx)
+{
+	return psp_execute_load_ip_fw_cmd_buf(adev, NULL,
+		inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
+		adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
+		(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
+			   (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2 -0
index 92d5534df5f4..3ac5ad91ed08 100644
@@ -414,4 +414,6 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,
 			struct ras_common_if *ras_block);
 int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
 
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx);
+
 #endif
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -3
index c975aed2f6c7..74cd1522067c 100644
@@ -881,9 +881,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
 		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, 0);
 
 	/* force RBC into idle state */
 	rb_bufsz = order_base_2(ring->ring_size);
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -3
index bb1875f926f1..79d40203c952 100644
@@ -912,9 +912,7 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_dec;
 	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1 -3
index c8f63b3c6f69..9e1570648b6c 100644
@@ -1037,9 +1037,7 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 		VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_dec;
 	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -3
index 2db73a964031..4febc7629512 100644
@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 
 
 	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1 -3
index 5d67b8b8a3d6..ce8c766dcc73 100644
@@ -778,9 +778,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
 		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
Signature · 1 line
2.25.1
author
#2 lore raw

Re: [PATCH 2/2] drm/amdgpu: use psp_execute_load_ip_fw_cmd_buf instead

Ping.

Quoted 184 lines · Lang Yu

Replace the old ones with psp_execute_load_ip_fw_cmd_buf.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++---------------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c |  9 +++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h |  2 ++
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c   |  4 +---
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c |  4 +---
 9 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -27
index a1cb541f315f..b61963112118 100644
@@ -2474,21 +2474,11 @@ int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
 	return ret;
 }
 
-static int psp_execute_non_psp_fw_load(struct psp_context *psp,
-				  struct amdgpu_firmware_info *ucode)
+static inline
+int psp_execute_non_psp_fw_load(struct psp_context *psp,
+				struct amdgpu_firmware_info *ucode)
 {
-	int ret = 0;
-	struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
-
-	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
-	if (!ret) {
-		ret = psp_cmd_submit_buf(psp, ucode, cmd,
-					 psp->fence_buf_mc_addr);
-	}
-
-	release_psp_cmd_buf(psp);
-
-	return ret;
+	return psp_execute_load_ip_fw_cmd_buf(psp->adev, ucode, 0, 0, 0);
 }
 
 static int psp_load_smu_fw(struct psp_context *psp)
@@ -2946,19 +2936,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
 	return ret;
 }
 
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size)
-{
-	struct amdgpu_firmware_info ucode = {0};
-
-	ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
-		AMDGPU_UCODE_ID_VCN0_RAM;
-	ucode.mc_addr = cmd_gpu_addr;
-	ucode.ucode_size = cmd_size;
-
-	return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
-}
-
 int psp_ring_cmd_submit(struct psp_context *psp,
 			uint64_t cmd_buf_mc_addr,
 			uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -2
index bd324fed6237..e49984a9d570 100644
@@ -459,8 +459,6 @@ extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_inde
 			uint32_t field_val, uint32_t mask, uint32_t msec_timeout);
 
 int psp_gpu_reset(struct amdgpu_device *adev);
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size);
 
 int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
 				   struct amdgpu_firmware_info *ucode,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +9 -0
index d37ebd4402ef..1805cd042d34 100644
@@ -1257,3 +1257,12 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)
 
 	return 0;
 }
+
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx)
+{
+	return psp_execute_load_ip_fw_cmd_buf(adev, NULL,
+		inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
+		adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
+		(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
+			   (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2 -0
index 92d5534df5f4..3ac5ad91ed08 100644
@@ -414,4 +414,6 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,
 			struct ras_common_if *ras_block);
 int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
 
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx);
+
 #endif
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -3
index c975aed2f6c7..74cd1522067c 100644
@@ -881,9 +881,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
 		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, 0);
 
 	/* force RBC into idle state */
 	rb_bufsz = order_base_2(ring->ring_size);
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -3
index bb1875f926f1..79d40203c952 100644
@@ -912,9 +912,7 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_dec;
 	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1 -3
index c8f63b3c6f69..9e1570648b6c 100644
@@ -1037,9 +1037,7 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 		VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_dec;
 	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -3
index 2db73a964031..4febc7629512 100644
@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 
 
 	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1 -3
index 5d67b8b8a3d6..ce8c766dcc73 100644
@@ -778,9 +778,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
 		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
 	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
 	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH 2/2] drm/amdgpu: use psp_execute_load_ip_fw_cmd_buf instead

Quoted 176 lines · Lang Yu

Ping.

Quoted 173 lines · Lang Yu

Replace the old ones with psp_execute_load_ip_fw_cmd_buf.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++---------------------
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  2 --
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c |  9 +++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h |  2 ++
  drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c |  4 +---
  9 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -27
index a1cb541f315f..b61963112118 100644
@@ -2474,21 +2474,11 @@ int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
  	return ret;
  }
 
-static int psp_execute_non_psp_fw_load(struct psp_context *psp,
-				  struct amdgpu_firmware_info *ucode)
+static inline
+int psp_execute_non_psp_fw_load(struct psp_context *psp,
+				struct amdgpu_firmware_info *ucode)
  {
-	int ret = 0;
-	struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
-
-	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
-	if (!ret) {
-		ret = psp_cmd_submit_buf(psp, ucode, cmd,
-					 psp->fence_buf_mc_addr);
-	}
-
-	release_psp_cmd_buf(psp);
-
-	return ret;
+	return psp_execute_load_ip_fw_cmd_buf(psp->adev, ucode, 0, 0, 0);
  }
 
  static int psp_load_smu_fw(struct psp_context *psp)
@@ -2946,19 +2936,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
  	return ret;
  }
 
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size)
-{
-	struct amdgpu_firmware_info ucode = {0};
-
-	ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
-		AMDGPU_UCODE_ID_VCN0_RAM;
-	ucode.mc_addr = cmd_gpu_addr;
-	ucode.ucode_size = cmd_size;
-
-	return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
-}
-
  int psp_ring_cmd_submit(struct psp_context *psp,
  			uint64_t cmd_buf_mc_addr,
  			uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -2
index bd324fed6237..e49984a9d570 100644
@@ -459,8 +459,6 @@ extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_inde
  			uint32_t field_val, uint32_t mask, uint32_t msec_timeout);
 
  int psp_gpu_reset(struct amdgpu_device *adev);
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size);
 
  int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
  				   struct amdgpu_firmware_info *ucode,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +9 -0
index d37ebd4402ef..1805cd042d34 100644
@@ -1257,3 +1257,12 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)
 
  	return 0;
  }
+
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx)
+{
+	return psp_execute_load_ip_fw_cmd_buf(adev, NULL,
+		inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
+		adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
+		(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
+			   (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2 -0
index 92d5534df5f4..3ac5ad91ed08 100644
@@ -414,4 +414,6 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,
  			struct ras_common_if *ras_block);
  int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
 
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx);
+
  #endif
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -3
index c975aed2f6c7..74cd1522067c 100644
@@ -881,9 +881,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, 0);
 
  	/* force RBC into idle state */
  	rb_bufsz = order_base_2(ring->ring_size);
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -3
index bb1875f926f1..79d40203c952 100644
@@ -912,9 +912,7 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_dec;
  	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1 -3
index c8f63b3c6f69..9e1570648b6c 100644
@@ -1037,9 +1037,7 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  		VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_dec;
  	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -3
index 2db73a964031..4febc7629512 100644
@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 
 
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +0 -0
index 5d67b8b8a3d6..ce8c766dcc73 100644
@@ -778,9 +778,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
Quoted 5 lines

drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b · line 781

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1 -3
  	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);

This patch breaks this usecase. Here it has uses a specific UCODE ID (here it's always VCN0_RAM), but the buffers are different. In general, instance ids cannot be associated with the UCODE ID to be used.

Thanks,
Lijo

Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +0 -0
  	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
Signature · 1 line
2.25.1
author
#4 lore raw

Re: [PATCH 2/2] drm/amdgpu: use psp_execute_load_ip_fw_cmd_buf instead

Quoted 162 lines · Lijo
Quoted 159 lines · Lang Yu

Ping.

Quoted 156 lines · Lang Yu

Replace the old ones with psp_execute_load_ip_fw_cmd_buf.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++---------------------
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  2 --
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c |  9 +++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h |  2 ++
  drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c |  4 +---
  9 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -27
index a1cb541f315f..b61963112118 100644
@@ -2474,21 +2474,11 @@ int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
  	return ret;
  }
-static int psp_execute_non_psp_fw_load(struct psp_context *psp,
-				  struct amdgpu_firmware_info *ucode)
+static inline
+int psp_execute_non_psp_fw_load(struct psp_context *psp,
+				struct amdgpu_firmware_info *ucode)
  {
-	int ret = 0;
-	struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
-
-	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
-	if (!ret) {
-		ret = psp_cmd_submit_buf(psp, ucode, cmd,
-					 psp->fence_buf_mc_addr);
-	}
-
-	release_psp_cmd_buf(psp);
-
-	return ret;
+	return psp_execute_load_ip_fw_cmd_buf(psp->adev, ucode, 0, 0, 0);
  }
  static int psp_load_smu_fw(struct psp_context *psp)
@@ -2946,19 +2936,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
  	return ret;
  }
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size)
-{
-	struct amdgpu_firmware_info ucode = {0};
-
-	ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
-		AMDGPU_UCODE_ID_VCN0_RAM;
-	ucode.mc_addr = cmd_gpu_addr;
-	ucode.ucode_size = cmd_size;
-
-	return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
-}
-
  int psp_ring_cmd_submit(struct psp_context *psp,
  			uint64_t cmd_buf_mc_addr,
  			uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -2
index bd324fed6237..e49984a9d570 100644
@@ -459,8 +459,6 @@ extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_inde
  			uint32_t field_val, uint32_t mask, uint32_t msec_timeout);
  int psp_gpu_reset(struct amdgpu_device *adev);
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size);
  int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
  				   struct amdgpu_firmware_info *ucode,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +9 -0
index d37ebd4402ef..1805cd042d34 100644
@@ -1257,3 +1257,12 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)
  	return 0;
  }
+
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx)
+{
+	return psp_execute_load_ip_fw_cmd_buf(adev, NULL,
+		inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
+		adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
+		(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
+			   (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2 -0
index 92d5534df5f4..3ac5ad91ed08 100644
@@ -414,4 +414,6 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,
  			struct ras_common_if *ras_block);
  int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx);
+
  #endif
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -3
index c975aed2f6c7..74cd1522067c 100644
@@ -881,9 +881,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
  	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, 0);
  	/* force RBC into idle state */
  	rb_bufsz = order_base_2(ring->ring_size);
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -3
index bb1875f926f1..79d40203c952 100644
@@ -912,9 +912,7 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
  	ring = &adev->vcn.inst[inst_idx].ring_dec;
  	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1 -3
index c8f63b3c6f69..9e1570648b6c 100644
@@ -1037,9 +1037,7 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  		VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
  	ring = &adev->vcn.inst[inst_idx].ring_dec;
  	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -3
index 2db73a964031..4febc7629512 100644
@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
  	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +0 -0
index 5d67b8b8a3d6..ce8c766dcc73 100644
@@ -778,9 +778,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
  	if (indirect)
Quoted 8 lines
Quoted 4 lines

drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b · line 781

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1 -3
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);

This patch breaks this usecase. Here it has uses a specific UCODE ID (here it's always VCN0_RAM), but the buffers are different. In general, instance ids cannot be associated with the UCODE ID to be used.

Thanks for pointing this out.

Regards,
Lang

Quoted 7 lines

Thanks,
Lijo

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +0 -0
  	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] drm/amdgpu: use psp_execute_load_ip_fw_cmd_buf instead

In reply to Lang Yu

It looks good to me. The series is:

Quoted 181 lines · Lang Yu

Replace the old ones with psp_execute_load_ip_fw_cmd_buf.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++---------------------
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  2 --
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c |  9 +++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h |  2 ++
  drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c   |  4 +---
  drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c |  4 +---
  9 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -27
index a1cb541f315f..b61963112118 100644
@@ -2474,21 +2474,11 @@ int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
  	return ret;
  }
 
-static int psp_execute_non_psp_fw_load(struct psp_context *psp,
-				  struct amdgpu_firmware_info *ucode)
+static inline
+int psp_execute_non_psp_fw_load(struct psp_context *psp,
+				struct amdgpu_firmware_info *ucode)
  {
-	int ret = 0;
-	struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
-
-	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
-	if (!ret) {
-		ret = psp_cmd_submit_buf(psp, ucode, cmd,
-					 psp->fence_buf_mc_addr);
-	}
-
-	release_psp_cmd_buf(psp);
-
-	return ret;
+	return psp_execute_load_ip_fw_cmd_buf(psp->adev, ucode, 0, 0, 0);
  }
 
  static int psp_load_smu_fw(struct psp_context *psp)
@@ -2946,19 +2936,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
  	return ret;
  }
 
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size)
-{
-	struct amdgpu_firmware_info ucode = {0};
-
-	ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
-		AMDGPU_UCODE_ID_VCN0_RAM;
-	ucode.mc_addr = cmd_gpu_addr;
-	ucode.ucode_size = cmd_size;
-
-	return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
-}
-
  int psp_ring_cmd_submit(struct psp_context *psp,
  			uint64_t cmd_buf_mc_addr,
  			uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -2
index bd324fed6237..e49984a9d570 100644
@@ -459,8 +459,6 @@ extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_inde
  			uint32_t field_val, uint32_t mask, uint32_t msec_timeout);
 
  int psp_gpu_reset(struct amdgpu_device *adev);
-int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
-			uint64_t cmd_gpu_addr, int cmd_size);
 
  int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
  				   struct amdgpu_firmware_info *ucode,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +9 -0
index d37ebd4402ef..1805cd042d34 100644
@@ -1257,3 +1257,12 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)
 
  	return 0;
  }
+
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx)
+{
+	return psp_execute_load_ip_fw_cmd_buf(adev, NULL,
+		inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM : AMDGPU_UCODE_ID_VCN0_RAM,
+		adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
+		(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
+			   (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2 -0
index 92d5534df5f4..3ac5ad91ed08 100644
@@ -414,4 +414,6 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,
  			struct ras_common_if *ras_block);
  int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
 
+int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx);
+
  #endif
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -3
index c975aed2f6c7..74cd1522067c 100644
@@ -881,9 +881,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, 0);
 
  	/* force RBC into idle state */
  	rb_bufsz = order_base_2(ring->ring_size);
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -3
index bb1875f926f1..79d40203c952 100644
@@ -912,9 +912,7 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-				    (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-					       (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_dec;
  	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1 -3
index c8f63b3c6f69..9e1570648b6c 100644
@@ -1037,9 +1037,7 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
  		VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_dec;
  	/* force RBC into idle state */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -3
index 2db73a964031..4febc7629512 100644
@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
 
 
  	if (indirect)
-		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1 -3
index 5d67b8b8a3d6..ce8c766dcc73 100644
@@ -778,9 +778,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
  		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
 
  	if (indirect)
-		psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
-			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
-				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
+		amdgpu_vcn_psp_update_sram(adev, inst_idx);
 
  	ring = &adev->vcn.inst[inst_idx].ring_enc[0];
 
author
#6 lore raw
In reply to Lang Yu

Ping.

Quoted 68 lines · Lang Yu

This function is more general and easy to use by more clients.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 29 +++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  6 +++++
 2 files changed, 35 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +29 -0
index a33c155dddcf..a1cb541f315f 100644
@@ -2445,6 +2445,35 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
 	return ret;
 }
 
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+				   struct amdgpu_firmware_info *ucode,
+				   uint32_t ucode_id,
+				   uint64_t cmd_buf_gpu_addr,
+				   int cmd_buf_size)
+{
+	struct amdgpu_firmware_info fw_info = {
+		.ucode_id = ucode_id,
+		.mc_addr = cmd_buf_gpu_addr,
+		.ucode_size = cmd_buf_size,
+	};
+	struct psp_context *psp = &adev->psp;
+	struct psp_gfx_cmd_resp *cmd =
+		acquire_psp_cmd_buf(psp);
+	int ret;
+
+	if (!ucode)
+		ucode = &fw_info;
+
+	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
+	if (!ret)
+		ret = psp_cmd_submit_buf(psp, ucode, cmd,
+					 psp->fence_buf_mc_addr);
+
+	release_psp_cmd_buf(psp);
+
+	return ret;
+}
+
 static int psp_execute_non_psp_fw_load(struct psp_context *psp,
 				  struct amdgpu_firmware_info *ucode)
 {
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
index 4847aacdf9dc..bd324fed6237 100644
@@ -462,6 +462,12 @@ int psp_gpu_reset(struct amdgpu_device *adev);
 int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
 			uint64_t cmd_gpu_addr, int cmd_size);
 
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+				   struct amdgpu_firmware_info *ucode,
+				   uint32_t ucode_id,
+				   uint64_t cmd_buf_gpu_addr,
+				   int cmd_buf_size);
+
 int psp_ta_init_shared_buf(struct psp_context *psp,
 				  struct ta_mem_context *mem_ctx);
 void psp_ta_free_shared_buf(struct ta_mem_context *mem_ctx);
Signature · 1 line
2.25.1
#7 lore raw
In reply to Lang Yu

Looks good to me.

The patch set is Reviewed-by: Veerabadhran Gopalakrishnan <[email protected]>

Regards,

Veera

Quoted 65 lines · Lang Yu

This function is more general and easy to use by more clients.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 29 +++++++++++++++++++++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  6 +++++
  2 files changed, 35 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +29 -0
index a33c155dddcf..a1cb541f315f 100644
@@ -2445,6 +2445,35 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
  	return ret;
  }
 
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+				   struct amdgpu_firmware_info *ucode,
+				   uint32_t ucode_id,
+				   uint64_t cmd_buf_gpu_addr,
+				   int cmd_buf_size)
+{
+	struct amdgpu_firmware_info fw_info = {
+		.ucode_id = ucode_id,
+		.mc_addr = cmd_buf_gpu_addr,
+		.ucode_size = cmd_buf_size,
+	};
+	struct psp_context *psp = &adev->psp;
+	struct psp_gfx_cmd_resp *cmd =
+		acquire_psp_cmd_buf(psp);
+	int ret;
+
+	if (!ucode)
+		ucode = &fw_info;
+
+	ret = psp_prep_load_ip_fw_cmd_buf(ucode, cmd);
+	if (!ret)
+		ret = psp_cmd_submit_buf(psp, ucode, cmd,
+					 psp->fence_buf_mc_addr);
+
+	release_psp_cmd_buf(psp);
+
+	return ret;
+}
+
  static int psp_execute_non_psp_fw_load(struct psp_context *psp,
  				  struct amdgpu_firmware_info *ucode)
  {
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
index 4847aacdf9dc..bd324fed6237 100644
@@ -462,6 +462,12 @@ int psp_gpu_reset(struct amdgpu_device *adev);
  int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
  			uint64_t cmd_gpu_addr, int cmd_size);
 
+int psp_execute_load_ip_fw_cmd_buf(struct amdgpu_device *adev,
+				   struct amdgpu_firmware_info *ucode,
+				   uint32_t ucode_id,
+				   uint64_t cmd_buf_gpu_addr,
+				   int cmd_buf_size);
+
  int psp_ta_init_shared_buf(struct psp_context *psp,
  				  struct ta_mem_context *mem_ctx);
  void psp_ta_free_shared_buf(struct ta_mem_context *mem_ctx);