summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2022-07-27 07:08:35 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2022-07-27 07:08:35 +0000
commitf0afd5ce5ff3fb799e6521fc8abb0e3ec5f3cf5e (patch)
tree9ca6e58a43f514f5d759f4f9d51f9dbe51519880 /sys/dev/pci/drm/i915
parentdd5a9892bb6377c2621287d46d6744fe2f5676c3 (diff)
now that llist is fixed enable more of i915 __notify_execute_cb()
this path is called when running the intel xorg driver on broadwell
Diffstat (limited to 'sys/dev/pci/drm/i915')
-rw-r--r--sys/dev/pci/drm/i915/i915_request.c15
1 files changed, 3 insertions, 12 deletions
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)