diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-07-22 12:16:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-22 12:19:45 +1000 |
| commit | 7f5ec14a4e07a2a78fbde069709d5c8806882be2 (patch) | |
| tree | 368da83c156c04d2275402f034e7fffa206b34f9 /include | |
| parent | 1c46f3c0759116d70cb424fc227371a254c47b25 (diff) | |
| parent | 02c87df2480ac855d88ee308ce3fa857d9bd55a8 (diff) | |
| download | linux-7f5ec14a4e07a2a78fbde069709d5c8806882be2.tar.bz2 | |
Merge tag 'drm-misc-fixes-2022-07-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A scheduling-while-atomic fix for drm/scheduler, a locking fix for TTM,
a typo fix for panel-edp and a resource removal fix for imx/dcss
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220721085550.hrwbukj34y56rzva@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/gpu_scheduler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 0fca8f38bee4..addb135eeea6 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -28,7 +28,7 @@ #include <linux/dma-fence.h> #include <linux/completion.h> #include <linux/xarray.h> -#include <linux/irq_work.h> +#include <linux/workqueue.h> #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000) @@ -295,7 +295,7 @@ struct drm_sched_job { */ union { struct dma_fence_cb finish_cb; - struct irq_work work; + struct work_struct work; }; uint64_t id; |