diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-01 01:24:29 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 02:20:00 -0400 |
commit | b3beb167af0de6d7cb03aed0687eca645cfd06a6 (patch) | |
tree | 2699384f75536511e57a862b206c83b4405fa197 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
parent | 479dcaea09bf17e8de7005015345e4266723666d (diff) |
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 c14466ba69b..f34c532bcac 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, | |||
169 | virt += (end - pte); | 169 | virt += (end - pte); |
170 | 170 | ||
171 | while (pte < end) { | 171 | while (pte < end) { |
172 | nv_wo32(dev, pgt, pte++, offset_l); | 172 | nv_wo32(pgt, (pte * 4) + 0, offset_l); |
173 | nv_wo32(dev, pgt, pte++, offset_h); | 173 | nv_wo32(pgt, (pte * 4) + 4, offset_h); |
174 | pte += 2; | ||
174 | } | 175 | } |
175 | } | 176 | } |
176 | } | 177 | } |
@@ -203,8 +204,10 @@ nv50_mem_vm_unbind(struct drm_device *dev, uint64_t virt, uint32_t size) | |||
203 | pages -= (end - pte); | 204 | pages -= (end - pte); |
204 | virt += (end - pte) << 15; | 205 | virt += (end - pte) << 15; |
205 | 206 | ||
206 | while (pte < end) | 207 | while (pte < end) { |
207 | nv_wo32(dev, pgt, pte++, 0); | 208 | nv_wo32(pgt, (pte * 4), 0); |
209 | pte++; | ||
210 | } | ||
208 | } | 211 | } |
209 | dev_priv->engine.instmem.flush(dev); | 212 | dev_priv->engine.instmem.flush(dev); |
210 | 213 | ||