Public paste
Undefined
By: Guest | Date: Dec 28 2009 00:20 | Format: None | Expires: never | Size: 1.11 KB | Hits: 512

  1. diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
  2. index c1ac34b..21c90a1 100644
  3. --- a/drivers/gpu/drm/nouveau/nouveau_channel.c
  4. +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
  5. @@ -314,6 +314,8 @@ nouveau_channel_free(struct nouveau_channel *chan)
  6.          */
  7.         nouveau_fence_fini(chan);
  8.  
  9. +       pfifo->cache_flush(dev);
  10. +
  11.         /* Ensure the channel is no longer active on the GPU */
  12.         pfifo->reassign(dev, false);
  13.  
  14. diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
  15. index a6b573e..9c2e4bf 100644
  16. --- a/drivers/gpu/drm/nouveau/nouveau_state.c
  17. +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
  18. @@ -293,6 +293,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
  19.                 engine->fifo.disable            = nv04_fifo_disable;
  20.                 engine->fifo.enable             = nv04_fifo_enable;
  21.                 engine->fifo.reassign           = nv04_fifo_reassign;
  22. +               engine->fifo.cache_flush        = nv04_fifo_cache_flush;
  23.                 engine->fifo.channel_id         = nv50_fifo_channel_id;
  24.                 engine->fifo.create_context     = nv50_fifo_create_context;
  25.                 engine->fifo.destroy_context    = nv50_fifo_destroy_context;