diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-01-27 04:04:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-01-27 04:04:34 +1000 |
| commit | 4d7acc8f48bcf27d0dc068f02e55c77e840b9110 (patch) | |
| tree | 359f76cc3a1256f988bb886cee53aba14ea39938 /drivers/gpu/drm/nouveau/nouveau_fence.h | |
| parent | 9c4a1126ad9ce6699cc6ad2ca7c590cd1203c70f (diff) | |
| download | linux-4d7acc8f48bcf27d0dc068f02e55c77e840b9110.tar.gz linux-4d7acc8f48bcf27d0dc068f02e55c77e840b9110.tar.bz2 linux-4d7acc8f48bcf27d0dc068f02e55c77e840b9110.zip | |
Revert "nouveau: push event block/allowing out of the fence context"
This reverts commit eacabb5462717a52fccbbbba458365a4f5e61f35.
This commit causes some regressions in desktop usage, this will
reintroduce the original deadlock in DRI_PRIME situations, I've
got an idea to fix it by offloading to a workqueue in a different
spot, however this code has a race condition where we sometimes
miss interrupts so I'd like to fix that as well.
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h index 28f5cf013b89..64d33ae7f356 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.h +++ b/drivers/gpu/drm/nouveau/nouveau_fence.h @@ -3,7 +3,6 @@ #define __NOUVEAU_FENCE_H__ #include <linux/dma-fence.h> -#include <linux/workqueue.h> #include <nvif/event.h> struct nouveau_drm; @@ -46,9 +45,7 @@ struct nouveau_fence_chan { char name[32]; struct nvif_event event; - struct work_struct allow_block_work; - atomic_t notify_ref; - int dead, killed; + int notify_ref, dead, killed; }; struct nouveau_fence_priv { |