diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c

index c1ac34b..f2527d3 100644

--- a/drivers/gpu/drm/nouveau/nouveau_channel.c

+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c

@@ -317,6 +317,9 @@ nouveau_channel_free(struct nouveau_channel *chan)

        /* Ensure the channel is no longer active on the GPU */

        pfifo->reassign(dev, false);

 

+       if (pfifo->channel_id(dev) == chan->id)

+               pfifo->cache_flush(dev);

+

        if (pgraph->channel(dev) == chan) {

                pgraph->fifo_access(dev, false);

                pgraph->unload_context(dev);

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c

index a6b573e..9c2e4bf 100644

--- a/drivers/gpu/drm/nouveau/nouveau_state.c

+++ b/drivers/gpu/drm/nouveau/nouveau_state.c

@@ -293,6 +293,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)

                engine->fifo.disable            = nv04_fifo_disable;

                engine->fifo.enable             = nv04_fifo_enable;

                engine->fifo.reassign           = nv04_fifo_reassign;

+               engine->fifo.cache_flush        = nv04_fifo_cache_flush;

                engine->fifo.channel_id         = nv50_fifo_channel_id;

                engine->fifo.create_context     = nv50_fifo_create_context;

                engine->fifo.destroy_context    = nv50_fifo_destroy_context;