projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d02836b
)
drm/nv50-nvc0: lookup pushbuf virtual address on dma_push
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 7 Jun 2011 03:23:47 +0000
(13:23 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 23 Jun 2011 06:00:22 +0000
(16:00 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_dma.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_dma.c
b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 4b294295f5e0720f91e8263f61a6c18c2fafccd2..00bc6eaad558069a2d59c392124a120e57ddc6e8 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/
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 + delt
a;
+
struct nouveau_vma *vm
a;
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));