amdgpu: use common fence structure for dependencies as well.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>

amdgpu/amdgpu.h

@@ -57,7 +57,7 @@ struct drm_amdgpu_info_hw_ip;
 #define AMDGPU_TIMEOUT_INFINITE			0xffffffffffffffffull
 
 /**
- * Used in amdgpu_cs_query_fence::flags, meaning that the given timeout
+ * Used in amdgpu_cs_query_fence_status(), meaning that the given timeout
  * is absolute.
  */
 #define AMDGPU_QUERY_FENCE_TIMEOUT_IS_ABSOLUTE     (1 << 0)
@@ -266,13 +266,14 @@ struct amdgpu_gds_resource_info {
 };
 
 /**
- * Structure describing CS dependency
+ * Structure describing CS fence
  *
- * \sa amdgpu_cs_request, amdgpu_cs_submit()
+ * \sa amdgpu_cs_query_fence_status(), amdgpu_cs_request, amdgpu_cs_submit()
  *
 */
-struct amdgpu_cs_dep_info {
-	/** Context to which the fence belongs */
+struct amdgpu_cs_fence {
+
+	/** In which context IB was sent to execution */
 	amdgpu_context_handle context;
 
 	/** To which HW IP type the fence belongs */
@@ -347,7 +348,7 @@ struct amdgpu_cs_request {
 	 * Array of dependencies which need to be met before
 	 * execution can start.
 	 */
-	struct amdgpu_cs_dep_info *dependencies;
+	struct amdgpu_cs_fence *dependencies;
 
 	/** Number of IBs to submit in the field ibs. */
 	uint32_t number_of_ibs;
@@ -358,30 +359,6 @@ struct amdgpu_cs_request {
 	struct amdgpu_cs_ib_info *ibs;
 };
 
-/**
- * Structure describing request to check submission state using fence
- *
- * \sa amdgpu_cs_query_fence_status()
- *
-*/
-struct amdgpu_cs_query_fence {
-
-	/** In which context IB was sent to execution */
-	amdgpu_context_handle context;
-
-	/** To which HW IP type the fence belongs */
-	unsigned ip_type;
-
-	/** IP instance index if there are several IPs of the same type. */
-	unsigned ip_instance;
-
-	/** Ring index of the HW IP */
-	uint32_t ring;
-
-	/** Specify fence for which we need to check submission status.*/
-	uint64_t fence;
-};
-
 /**
  * Structure which provide information about GPU VM MC Address space
  * alignments requirements
@@ -919,7 +896,7 @@ int amdgpu_cs_submit(amdgpu_context_handle context,
  *
  * \sa amdgpu_cs_submit()
 */
-int amdgpu_cs_query_fence_status(struct amdgpu_cs_query_fence *fence,
+int amdgpu_cs_query_fence_status(struct amdgpu_cs_fence *fence,
 				 uint64_t timeout_ns,
 				 uint64_t flags,
 				 uint32_t *expired);

amdgpu/amdgpu_cs.c

@@ -259,7 +259,7 @@ static int amdgpu_cs_submit_one(amdgpu_context_handle context,
 		}
 
 		for (i = 0; i < ibs_request->number_of_dependencies; ++i) {
-			struct amdgpu_cs_dep_info *info = &ibs_request->dependencies[i];
+			struct amdgpu_cs_fence *info = &ibs_request->dependencies[i];
 			struct drm_amdgpu_cs_chunk_dep *dep = &dependencies[i];
 			dep->ip_type = info->ip_type;
 			dep->ip_instance = info->ip_instance;
@@ -379,7 +379,7 @@ static int amdgpu_ioctl_wait_cs(amdgpu_context_handle context,
 	return 0;
 }
 
-int amdgpu_cs_query_fence_status(struct amdgpu_cs_query_fence *fence,
+int amdgpu_cs_query_fence_status(struct amdgpu_cs_fence *fence,
 				 uint64_t timeout_ns,
 				 uint64_t flags,
 				 uint32_t *expired)

tests/amdgpu/basic_tests.c

@@ -161,7 +161,7 @@ static void amdgpu_command_submission_gfx_separate_ibs(void)
 	uint64_t ib_result_mc_address, ib_result_ce_mc_address;
 	struct amdgpu_cs_request ibs_request = {0};
 	struct amdgpu_cs_ib_info ib_info[2];
-	struct amdgpu_cs_query_fence fence_status = {0};
+	struct amdgpu_cs_fence fence_status = {0};
 	uint32_t *ptr;
 	uint32_t expired;
 	amdgpu_bo_list_handle bo_list;
@@ -243,7 +243,7 @@ static void amdgpu_command_submission_gfx_shared_ib(void)
 	uint64_t ib_result_mc_address;
 	struct amdgpu_cs_request ibs_request = {0};
 	struct amdgpu_cs_ib_info ib_info[2];
-	struct amdgpu_cs_query_fence fence_status = {0};
+	struct amdgpu_cs_fence fence_status = {0};
 	uint32_t *ptr;
 	uint32_t expired;
 	amdgpu_bo_list_handle bo_list;
@@ -323,7 +323,7 @@ static void amdgpu_command_submission_compute(void)
 	uint64_t ib_result_mc_address;
 	struct amdgpu_cs_request ibs_request;
 	struct amdgpu_cs_ib_info ib_info;
-	struct amdgpu_cs_query_fence fence_status;
+	struct amdgpu_cs_fence fence_status;
 	uint32_t *ptr;
 	uint32_t expired;
 	int i, r, instance;
@@ -358,7 +358,7 @@ static void amdgpu_command_submission_compute(void)
 		ibs_request.ibs = &ib_info;
 		ibs_request.resources = bo_list;
 
-		memset(&fence_status, 0, sizeof(struct amdgpu_cs_query_fence));
+		memset(&fence_status, 0, sizeof(struct amdgpu_cs_fence));
 		r = amdgpu_cs_submit(context_handle, 0,
 				     &ibs_request, 1, &fence_status.fence);
 		CU_ASSERT_EQUAL(r, 0);
@@ -400,7 +400,7 @@ static void amdgpu_sdma_test_exec_cs(amdgpu_context_handle context_handle,
 	amdgpu_bo_handle ib_result_handle;
 	void *ib_result_cpu;
 	uint64_t ib_result_mc_address;
-	struct amdgpu_cs_query_fence fence_status = {0};
+	struct amdgpu_cs_fence fence_status = {0};
 	amdgpu_bo_handle *all_res = alloca(sizeof(resources[0]) * (res_cnt + 1));
 
 	/* prepare CS */

tests/amdgpu/cs_tests.c

@@ -113,7 +113,7 @@ static int submit(unsigned ndw, unsigned ip)
 {
 	struct amdgpu_cs_request ibs_request = {0};
 	struct amdgpu_cs_ib_info ib_info = {0};
-	struct amdgpu_cs_query_fence fence_status = {0};
+	struct amdgpu_cs_fence fence_status = {0};
 	uint32_t expired;
 	int r;
 

tests/amdgpu/vce_tests.c

@@ -130,7 +130,7 @@ static int submit(unsigned ndw, unsigned ip)
 {
 	struct amdgpu_cs_request ibs_request = {0};
 	struct amdgpu_cs_ib_info ib_info = {0};
-	struct amdgpu_cs_query_fence fence_status = {0};
+	struct amdgpu_cs_fence fence_status = {0};
 	uint32_t expired;
 	int r;