diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c
b/src/gallium/drivers/nouveau/nouveau_screen.c
index a9426df..0918537 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -166,7 +166,8 @@ nouveau_screen_fence_finish(struct pipe_
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
index b18cad0..d2ce47e 100644
--- a/include/drm/nouveau_drm.h
+++ b/include/drm/nouveau_drm.h
@@ -49,6 +49,10 @@ struct drm_nouveau_channel_free {
int channel;
};
+struct drm_nouveau_channel_wait {
+ int channel;
+
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c
b/drivers/gpu/drm/nouveau/nouveau_channel.c
index a3d33a5..ac2fe5a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -466,6 +466,35 @@ nouveau_ioctl_fifo_free(struct drm_device *dev, vo
Hello everyone,
When trying the demo program copytex for the first time recently, I noticed
pathological behavior: after running for a long time it asserted out and
locked up X. Investigation showed this to be due to the glFinish function
acting like glFlush and not waiting as it is supposed to