diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-02 18:05:20 -0500 |
---|---|---|
committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-07 21:00:38 -0500 |
commit | a8b214f007e299225d3fcf10c46f7fc603c275fa (patch) | |
tree | e1eba17a16decce8d81850deba029794a44efe60 | |
parent | 7a45d764a8e3177f0c9cd4a0be9f2ab7965e55cb (diff) |
drm/nouveau: fix use of drm_mm_node in semaphore object
At some point in the future, this bo won't necessarily be backed by
a drm_mm_node, so use the start/size fields of the ttm_mem_reg instead.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 3d50d5c3b0fe..01290d2952ae 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c | |||
@@ -450,12 +450,11 @@ nouveau_fence_channel_init(struct nouveau_channel *chan) | |||
450 | 450 | ||
451 | /* Create a DMA object for the shared cross-channel sync area. */ | 451 | /* Create a DMA object for the shared cross-channel sync area. */ |
452 | if (USE_SEMA(dev)) { | 452 | if (USE_SEMA(dev)) { |
453 | struct drm_mm_node *mem = dev_priv->fence.bo->bo.mem.mm_node; | 453 | struct ttm_mem_reg *mem = &dev_priv->fence.bo->bo.mem; |
454 | 454 | ||
455 | ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY, | 455 | ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY, |
456 | mem->start << PAGE_SHIFT, | 456 | mem->start << PAGE_SHIFT, |
457 | mem->size << PAGE_SHIFT, | 457 | mem->size, NV_MEM_ACCESS_RW, |
458 | NV_MEM_ACCESS_RW, | ||
459 | NV_MEM_TARGET_VRAM, &obj); | 458 | NV_MEM_TARGET_VRAM, &obj); |
460 | if (ret) | 459 | if (ret) |
461 | return ret; | 460 | return ret; |