From 32a296fdacdf3b3e1b1b7f77208480e42a581e54 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 7 Jun 2011 13:23:47 +1000 Subject: [PATCH] --- yaml --- r: 260131 b: refs/heads/master c: 9f9f51fcb92ba3c1f395e0908407c8c1f5305a31 h: refs/heads/master i: 260129: 85aac9a6658c178d29583bc05015150472f76947 260127: 603106329e2f87708186c54f0c08e169c1b0fe41 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_dma.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a145a924df12..e5dd57bbdf12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d02836b4f5c24d2a38b3bdc10f05251e1f6e111d +refs/heads/master: 9f9f51fcb92ba3c1f395e0908407c8c1f5305a31 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c index 4b294295f5e0..00bc6eaad558 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -167,8 +167,13 @@ nv50_dma_push(struct nouveau_channel *chan, struct nouveau_bo *bo, int delta, int length) { struct nouveau_bo *pb = chan->pushbuf_bo; - uint64_t offset = bo->vma.offset + delta; + struct nouveau_vma *vma; int ip = (chan->dma.ib_put * 2) + chan->dma.ib_base; + u64 offset; + + vma = nouveau_bo_vma_find(bo, chan->vm); + BUG_ON(!vma); + offset = vma->offset + delta; BUG_ON(chan->dma.ib_free < 1); nouveau_bo_wr32(pb, ip++, lower_32_bits(offset));