[CI 8/8] dma-buf: Fix dma-fence-chain signaling ordering

[Matthew Brost <matthew.brost@intel.com>]

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
 drivers/dma-buf/dma-fence-chain.c |  6 +++---
 include/linux/dma-fence-chain.h   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c
index a8a90acf4f34..23f5cf467dd1 100644
--- a/drivers/dma-buf/dma-fence-chain.c
+++ b/drivers/dma-buf/dma-fence-chain.c
@@ -119,7 +119,7 @@ static const char *dma_fence_chain_get_timeline_name(struct dma_fence *fence)
         return "unbound";
 }
 
-static void dma_fence_chain_irq_work(struct irq_work *work)
+static void dma_fence_chain_work(struct work_struct *work)
 {
 	struct dma_fence_chain *chain;
 
@@ -137,8 +137,8 @@ static void dma_fence_chain_cb(struct dma_fence *f, struct dma_fence_cb *cb)
 	struct dma_fence_chain *chain;
 
 	chain = container_of(cb, typeof(*chain), cb);
-	init_irq_work(&chain->work, dma_fence_chain_irq_work);
-	irq_work_queue(&chain->work);
+	INIT_WORK(&chain->work, dma_fence_chain_work);
+	queue_work(system_ordered_wq, &chain->work);
 	dma_fence_put(f);
 }
 
diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h
index 68c3c1e41014..8e88d3d01fe6 100644
--- a/include/linux/dma-fence-chain.h
+++ b/include/linux/dma-fence-chain.h
@@ -11,8 +11,8 @@
 #define __LINUX_DMA_FENCE_CHAIN_H
 
 #include <linux/dma-fence.h>
-#include <linux/irq_work.h>
 #include <linux/slab.h>
+#include <linux/workqueue.h>
 
 /**
  * struct dma_fence_chain - fence to represent an node of a fence chain
@@ -33,18 +33,18 @@ struct dma_fence_chain {
 		 *
 		 * This is used to add the callback for signaling the
 		 * complection of the fence chain. Never used at the same time
-		 * as the irq work.
+		 * as the work.
 		 */
 		struct dma_fence_cb cb;
 
 		/**
-		 * @work: irq work item for signaling
+		 * @work: work item for signaling
 		 *
-		 * Irq work structure to allow us to add the callback without
+		 * Work structure to allow us to add the callback without
 		 * running into lock inversion. Never used at the same time as
 		 * the callback.
 		 */
-		struct irq_work work;
+		struct work_struct work;
 	};
 	spinlock_t lock;
 };
-- 
2.34.1