diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-01 15:24:29 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 16:20:00 +1000 |
| commit | b3beb167af0de6d7cb03aed0687eca645cfd06a6 (patch) | |
| tree | 2699384f75536511e57a862b206c83b4405fa197 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | 479dcaea09bf17e8de7005015345e4266723666d (diff) | |
| download | kernel_samsung_smdk4412-b3beb167af0de6d7cb03aed0687eca645cfd06a6.zip kernel_samsung_smdk4412-b3beb167af0de6d7cb03aed0687eca645cfd06a6.tar.gz kernel_samsung_smdk4412-b3beb167af0de6d7cb03aed0687eca645cfd06a6.tar.bz2 | |
drm/nouveau: modify object accessors, offset in bytes rather than dwords
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index c14466b..f34c532 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -169,8 +169,9 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size, virt += (end - pte); while (pte < end) { - nv_wo32(dev, pgt, pte++, offset_l); - nv_wo32(dev, pgt, pte++, offset_h); + nv_wo32(pgt, (pte * 4) + 0, offset_l); + nv_wo32(pgt, (pte * 4) + 4, offset_h); + pte += 2; } } } @@ -203,8 +204,10 @@ nv50_mem_vm_unbind(struct drm_device *dev, uint64_t virt, uint32_t size) pages -= (end - pte); virt += (end - pte) << 15; - while (pte < end) - nv_wo32(dev, pgt, pte++, 0); + while (pte < end) { + nv_wo32(pgt, (pte * 4), 0); + pte++; + } } dev_priv->engine.instmem.flush(dev); |