diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-01 15:24:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 16:20:23 +1000 |
| commit | 43efc9ce25c6956133c07394a6fa44ef2c9268a4 (patch) | |
| tree | 8da4a62301dbc850ca92c8094eb2a86c80bd3b1a /drivers/gpu/drm/nouveau/nvc0_instmem.c | |
| parent | a8eaebc6c52bb0cd243b4cb421068f42d378be9c (diff) | |
| download | kernel_samsung_smdk4412-43efc9ce25c6956133c07394a6fa44ef2c9268a4.zip kernel_samsung_smdk4412-43efc9ce25c6956133c07394a6fa44ef2c9268a4.tar.gz kernel_samsung_smdk4412-43efc9ce25c6956133c07394a6fa44ef2c9268a4.tar.bz2 | |
drm/nouveau: simplify fake gpu objects
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvc0_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_instmem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_instmem.c b/drivers/gpu/drm/nouveau/nvc0_instmem.c index 6b451f8..0ffdcf6 100644 --- a/drivers/gpu/drm/nouveau/nvc0_instmem.c +++ b/drivers/gpu/drm/nouveau/nvc0_instmem.c @@ -50,8 +50,7 @@ nvc0_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, return ret; } - gpuobj->im_backing_start = gpuobj->im_backing->bo.mem.mm_node->start; - gpuobj->im_backing_start <<= PAGE_SHIFT; + gpuobj->vinst = gpuobj->im_backing->bo.mem.mm_node->start << PAGE_SHIFT; return 0; } @@ -84,11 +83,11 @@ nvc0_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj) pte = gpuobj->im_pramin->start >> 12; pte_end = (gpuobj->im_pramin->size >> 12) + pte; - vram = gpuobj->im_backing_start; + vram = gpuobj->vinst; NV_DEBUG(dev, "pramin=0x%lx, pte=%d, pte_end=%d\n", gpuobj->im_pramin->start, pte, pte_end); - NV_DEBUG(dev, "first vram page: 0x%08x\n", gpuobj->im_backing_start); + NV_DEBUG(dev, "first vram page: 0x%010llx\n", gpuobj->vinst); while (pte < pte_end) { nv_wr32(dev, 0x702000 + (pte * 8), (vram >> 8) | 1); |