drm/nouveau: always do buffer object moves on bo->channel
Subsystems (3)
PATCH 1/1 drm/nouveau: always do buffer object moves on bo->channel
- Use the "direct" objects that previously only the kernel fifo had.
- This avoids corruption on some buffer moves.
Signed-off-by Maarten Maathuis <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 23 ++--------------- drivers/gpu/drm/nouveau/nouveau_object.c | 36 ++++++++++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_state.c | 38 +----------------------------- 3 files changed, 40 insertions(+), 57 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +3 -20
@@ -471,15 +471,9 @@ static inline uint32_t nouveau_bo_mem_ctxdma(struct nouveau_bo *nvbo, struct nouveau_channel *chan, struct ttm_mem_reg *mem) { - if (chan == nouveau_bdev(nvbo->bo.bdev)->channel) { - if (mem->mem_type == TTM_PL_TT) - return NvDmaGART; - return NvDmaVRAM; - } - if (mem->mem_type == TTM_PL_TT) -return chan->gart_handle; -return chan->vram_handle; + return NvDmaGART; + return NvDmaVRAM; } static int
@@ -495,22 +489,11 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,int ret; chan = nvbo->channel; -if (!chan || nvbo->tile_flags || nvbo->no_vm) +if (!chan) chan = dev_priv->channel; src_offset = old_mem->mm_node->start <<PAGE_SHIFT ; dst_offset = new_mem->mm_node->start <<PAGE_SHIFT ; -if (chan != dev_priv->channel) { -if (old_mem->mem_type ==TTM_PL_TT ) - src_offset += dev_priv->vm_gart_base; -else - src_offset += dev_priv->vm_vram_base; - -if (new_mem->mem_type ==TTM_PL_TT ) - dst_offset += dev_priv->vm_gart_base; -else - dst_offset += dev_priv->vm_vram_base; - } ret =RING_SPACE (chan,3 );if (ret)
drivers/gpu/drm/nouveau/nouveau_object.c +36 -0
@@ -33,6 +33,7 @@#include "drmP.h" #include "drm.h" #include "nouveau_drv.h" +#include "nouveau_dma.h" #include "nouveau_drm.h" /* NVidia uses context objects to drive drawing operations.
@@ -1099,6 +1100,41 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,return ret; } +/* Two objects for kernel consumption, on nv50 they allow direct access +* to vram. This is needed because we don't know the tiling layout. +*/ + vram =NULL ; + ret =nouveau_gpuobj_dma_new (chan,NV_CLASS_DMA_IN_MEMORY , +0 ,nouveau_mem_fb_amount (dev), +NV_DMA_ACCESS_RW ,NV_DMA_TARGET_VIDMEM , + &vram); +if (ret) { +NV_ERROR (dev,"Error creating direct VRAM ctxdma: %d\n" , ret); +return ret; + } + + ret =nouveau_gpuobj_ref_add (dev, chan, NvDmaVRAM, vram,NULL ); +if (ret) { +NV_ERROR (dev,"Error referencing direct VRAM ctxdma:" \ +" %d\n" , ret); +return ret; + } + + tt =NULL ; + ret =nouveau_gpuobj_gart_dma_new (chan,0 , + dev_priv->gart_info.aper_size, +NV_DMA_ACCESS_RW , &tt,NULL ); +if (ret) { +NV_ERROR (dev,"Error creating GART ctxdma: %d\n" , ret); +return ret; + } + + ret =nouveau_gpuobj_ref_add (dev, chan, NvDmaGART, tt,NULL ); +if (ret) { +NV_ERROR (dev,"Error referencing GART ctxdma: %d\n" , ret); +return ret; + } +return 0 ; }
drivers/gpu/drm/nouveau/nouveau_state.c +1 -37
@@ -321,46 +321,10 @@ static int nouveau_card_init_channel(struct drm_device *dev) {struct drm_nouveau_private *dev_priv = dev->dev_private; -struct nouveau_gpuobj *gpuobj; -int ret; - ret =nouveau_channel_alloc (dev, &dev_priv->channel, +return nouveau_channel_alloc (dev, &dev_priv->channel, (struct drm_file *)-2 , NvDmaFB, NvDmaTT); -if (ret) -return ret; - - gpuobj =NULL ; - ret =nouveau_gpuobj_dma_new (dev_priv->channel,NV_CLASS_DMA_IN_MEMORY , -0 ,nouveau_mem_fb_amount (dev), -NV_DMA_ACCESS_RW ,NV_DMA_TARGET_VIDMEM , - &gpuobj); -if (ret) - goto out_err; - - ret =nouveau_gpuobj_ref_add (dev, dev_priv->channel, NvDmaVRAM, - gpuobj,NULL ); -if (ret) - goto out_err; - - gpuobj =NULL ; - ret =nouveau_gpuobj_gart_dma_new (dev_priv->channel,0 , - dev_priv->gart_info.aper_size, -NV_DMA_ACCESS_RW , &gpuobj,NULL ); -if (ret) - goto out_err; - - ret =nouveau_gpuobj_ref_add (dev, dev_priv->channel, NvDmaGART, - gpuobj,NULL ); -if (ret) - goto out_err; - -return 0 ; -out_err: -nouveau_gpuobj_del (dev, &gpuobj); -nouveau_channel_free (dev_priv->channel); - dev_priv->channel =NULL ; -return ret; }int
Signature · 1 line
1.6.5.4