Commit 275654c0 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-xe-next-fixes-2024-05-09-1' of...

Merge tag 'drm-xe-next-fixes-2024-05-09-1' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next

Driver Changes:
- Use ordered WQ for G2H handler. (Matthew Brost)
- Use flexible-array rather than zero-sized (Lucas De Marchi)
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zjz7SzCvfA3vQRxu@fedora
parents 110ed472 d69c3d4b
...@@ -107,7 +107,7 @@ struct __guc_ads_blob { ...@@ -107,7 +107,7 @@ struct __guc_ads_blob {
struct guc_engine_usage engine_usage; struct guc_engine_usage engine_usage;
struct guc_um_init_params um_init_params; struct guc_um_init_params um_init_params;
/* From here on, location is dynamic! Refer to above diagram. */ /* From here on, location is dynamic! Refer to above diagram. */
struct guc_mmio_reg regset[0]; struct guc_mmio_reg regset[];
} __packed; } __packed;
#define ads_blob_read(ads_, field_) \ #define ads_blob_read(ads_, field_) \
......
...@@ -121,6 +121,7 @@ static void guc_ct_fini(struct drm_device *drm, void *arg) ...@@ -121,6 +121,7 @@ static void guc_ct_fini(struct drm_device *drm, void *arg)
{ {
struct xe_guc_ct *ct = arg; struct xe_guc_ct *ct = arg;
destroy_workqueue(ct->g2h_wq);
xa_destroy(&ct->fence_lookup); xa_destroy(&ct->fence_lookup);
} }
...@@ -146,6 +147,10 @@ int xe_guc_ct_init(struct xe_guc_ct *ct) ...@@ -146,6 +147,10 @@ int xe_guc_ct_init(struct xe_guc_ct *ct)
xe_gt_assert(gt, !(guc_ct_size() % PAGE_SIZE)); xe_gt_assert(gt, !(guc_ct_size() % PAGE_SIZE));
ct->g2h_wq = alloc_ordered_workqueue("xe-g2h-wq", 0);
if (!ct->g2h_wq)
return -ENOMEM;
spin_lock_init(&ct->fast_lock); spin_lock_init(&ct->fast_lock);
xa_init(&ct->fence_lookup); xa_init(&ct->fence_lookup);
INIT_WORK(&ct->g2h_worker, g2h_worker_func); INIT_WORK(&ct->g2h_worker, g2h_worker_func);
......
...@@ -34,7 +34,7 @@ static inline void xe_guc_ct_irq_handler(struct xe_guc_ct *ct) ...@@ -34,7 +34,7 @@ static inline void xe_guc_ct_irq_handler(struct xe_guc_ct *ct)
return; return;
wake_up_all(&ct->wq); wake_up_all(&ct->wq);
queue_work(system_unbound_wq, &ct->g2h_worker); queue_work(ct->g2h_wq, &ct->g2h_worker);
xe_guc_ct_fast_path(ct); xe_guc_ct_fast_path(ct);
} }
......
...@@ -120,6 +120,8 @@ struct xe_guc_ct { ...@@ -120,6 +120,8 @@ struct xe_guc_ct {
wait_queue_head_t wq; wait_queue_head_t wq;
/** @g2h_fence_wq: wait queue used for G2H fencing */ /** @g2h_fence_wq: wait queue used for G2H fencing */
wait_queue_head_t g2h_fence_wq; wait_queue_head_t g2h_fence_wq;
/** @g2h_wq: used to process G2H */
struct workqueue_struct *g2h_wq;
/** @msg: Message buffer */ /** @msg: Message buffer */
u32 msg[GUC_CTB_MSG_MAX_LEN]; u32 msg[GUC_CTB_MSG_MAX_LEN];
/** @fast_msg: Message buffer */ /** @fast_msg: Message buffer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment