Using zocl ert to handle dataflow CU on versal (Xilinx#2222)

sjmoneill · Oct 9, 2019 · a12d4d6 · a12d4d6
1 parent 3ede40b
commit a12d4d6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/mb_scheduler.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/mb_scheduler.c
@@ -1641,9 +1641,17 @@ exec_cfg_cmd(struct exec_core *exec, struct xocl_cmd *xcmd)
 	userpf_info(xdev, "ert per feature rom = %d", ert);
 	userpf_info(xdev, "dsa52 = %d", dsa);
 
-	if (XOCL_DSA_IS_VERSAL(xdev) && !cfg->polling) {
+	if (XOCL_DSA_IS_VERSAL(xdev)) {
 		userpf_info(xdev, "force polling mode for versal");
 		cfg->polling = true;
+
+		/*
+		 * For versal device, we will use ert_full if we are
+		 * configured as ert mode even dataflow is configured.
+		 * And we do not support ert_poll.
+		 */
+		ert_full = cfg->ert;
+		ert_poll = false;
 	}
 
 	/* Mark command as control command to force slot 0 execution */