[PATCH 1/4] paralleldep

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_scheduler.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c
index d2edb527dcb8..a8dae44430a4 100644
--- a/drivers/gpu/drm/i915/i915_scheduler.c
+++ b/drivers/gpu/drm/i915/i915_scheduler.c
@@ -428,7 +428,8 @@ bool __i915_sched_node_add_dependency(struct i915_sched_node *node,
 		 * within the non-preemptible FIFO.
 		 */
 		BUILD_BUG_ON(__NO_PREEMPTION & ~I915_PRIORITY_MASK);
-		if (flags & I915_DEPENDENCY_EXTERNAL)
+		if (flags & I915_DEPENDENCY_EXTERNAL &&
+		    (signal->attr.priority & __NO_PREEMPTION) == 0)
 			__bump_priority(signal, __NO_PREEMPTION);
 
 		ret = true;
-- 
2.24.0.rc2