From f0afd5ce5ff3fb799e6521fc8abb0e3ec5f3cf5e Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 27 Jul 2022 07:08:35 +0000 Subject: now that llist is fixed enable more of i915 __notify_execute_cb() this path is called when running the intel xorg driver on broadwell --- sys/dev/pci/drm/i915/i915_request.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'sys/dev/pci/drm/i915') diff --git a/sys/dev/pci/drm/i915/i915_request.c b/sys/dev/pci/drm/i915/i915_request.c index a2a5352b269..93935a88b29 100644 --- a/sys/dev/pci/drm/i915/i915_request.c +++ b/sys/dev/pci/drm/i915/i915_request.c @@ -165,7 +165,7 @@ static void irq_execute_cb(struct irq_work *wrk) struct execute_cb *cb = container_of(wrk, typeof(*cb), work); i915_sw_fence_complete(cb->fence); -#ifdef notyet +#ifdef __linux__ kmem_cache_free(slab_execute_cbs, cb); #else pool_put(&slab_execute_cbs, cb); @@ -180,13 +180,10 @@ __notify_execute_cb(struct i915_request *rq, bool (*fn)(struct irq_work *wrk)) if (llist_empty(&rq->execute_cb)) return; - STUB(); -#ifdef notyet llist_for_each_entry_safe(cb, cn, llist_del_all(&rq->execute_cb), work.node.llist) fn(&cb->work); -#endif } static void __notify_execute_cb_irq(struct i915_request *rq) @@ -196,10 +193,10 @@ static void __notify_execute_cb_irq(struct i915_request *rq) static bool irq_work_imm(struct irq_work *wrk) { -#ifdef notyet +#ifdef __linux__ wrk->func(wrk); #else - STUB(); + wrk->task.t_func(wrk); #endif return false; } @@ -506,11 +503,6 @@ __await_execution(struct i915_request *rq, if (i915_request_is_active(signal)) return 0; - STUB(); - i915_sw_fence_await(&rq->submit); - return -ENOSYS; -#ifdef notyet - #ifdef __linux__ cb = kmem_cache_alloc(slab_execute_cbs, gfp); #else @@ -544,7 +536,6 @@ __await_execution(struct i915_request *rq, } return 0; -#endif } static bool fatal_error(int error) -- cgit v1.2.3