summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-07-11 02:46:25 +0000
committerjsg <jsg@openbsd.org>2020-07-11 02:46:25 +0000
commit58a32cd0e5f1997ca2d5c6c1fc0d9f6b6f7ebb8f (patch)
tree0b37f10310a749157b8a5cddbe8831f51689a136
parenttest for gem_size > 0 on pool_destroy() matching pool_init() call (diff)
downloadwireguard-openbsd-58a32cd0e5f1997ca2d5c6c1fc0d9f6b6f7ebb8f.tar.xz
wireguard-openbsd-58a32cd0e5f1997ca2d5c6c1fc0d9f6b6f7ebb8f.zip
Change locks which don't use spin_lock_irq() or spin_lock_irqsave()
from IPL_TTY to IPL_NONE. From Benjamin Baier
-rw-r--r--sys/dev/pci/drm/scheduler/sched_entity.c2
-rw-r--r--sys/dev/pci/drm/scheduler/sched_main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/scheduler/sched_entity.c b/sys/dev/pci/drm/scheduler/sched_entity.c
index 7a4c0994350..70f07fd9767 100644
--- a/sys/dev/pci/drm/scheduler/sched_entity.c
+++ b/sys/dev/pci/drm/scheduler/sched_entity.c
@@ -73,7 +73,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity,
init_completion(&entity->entity_idle);
- mtx_init(&entity->rq_lock, IPL_TTY);
+ mtx_init(&entity->rq_lock, IPL_NONE);
spsc_queue_init(&entity->job_queue);
atomic_set(&entity->fence_seq, 0);
diff --git a/sys/dev/pci/drm/scheduler/sched_main.c b/sys/dev/pci/drm/scheduler/sched_main.c
index 0df6ccd9b25..6856c97d9f5 100644
--- a/sys/dev/pci/drm/scheduler/sched_main.c
+++ b/sys/dev/pci/drm/scheduler/sched_main.c
@@ -74,7 +74,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb);
static void drm_sched_rq_init(struct drm_gpu_scheduler *sched,
struct drm_sched_rq *rq)
{
- mtx_init(&rq->lock, IPL_TTY);
+ mtx_init(&rq->lock, IPL_NONE);
INIT_LIST_HEAD(&rq->entities);
rq->current_entity = NULL;
rq->sched = sched;
@@ -867,7 +867,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
init_waitqueue_head(&sched->wake_up_worker);
init_waitqueue_head(&sched->job_scheduled);
INIT_LIST_HEAD(&sched->ring_mirror_list);
- mtx_init(&sched->job_list_lock, IPL_TTY);
+ mtx_init(&sched->job_list_lock, IPL_NONE);
atomic_set(&sched->hw_rq_count, 0);
INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout);
atomic_set(&sched->num_jobs, 0);