diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-08-27 10:00:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-08 13:48:10 +1000 |
| commit | a11c3198c9ba38d81e25b65e3908d531feba1372 (patch) | |
| tree | 89f9489d91af56cf9a4a376ef5310989dd54bebb /drivers/gpu/drm/nouveau/nv50_instmem.c | |
| parent | 573a2a37e8648a3249426c816f51e7ef50f6f73e (diff) | |
| download | kernel_samsung_smdk4412-a11c3198c9ba38d81e25b65e3908d531feba1372.zip kernel_samsung_smdk4412-a11c3198c9ba38d81e25b65e3908d531feba1372.tar.gz kernel_samsung_smdk4412-a11c3198c9ba38d81e25b65e3908d531feba1372.tar.bz2 | |
drm/nv50: import new vm code
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 1e7d503..4eb2f08 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -27,7 +27,9 @@ #include "drmP.h" #include "drm.h" + #include "nouveau_drv.h" +#include "nouveau_vm.h" struct nv50_instmem_priv { uint32_t save1700[5]; /* 0x1700->0x1710 */ @@ -404,7 +406,7 @@ nv50_instmem_map(struct nouveau_gpuobj *gpuobj) } dev_priv->engine.instmem.flush(dev); - nv50_vm_flush(dev, 6); + nv50_vm_flush_engine(dev, 6); node->ramin = ramin; gpuobj->pinst = ramin->start; @@ -454,11 +456,3 @@ nv84_instmem_flush(struct drm_device *dev) NV_ERROR(dev, "PRAMIN flush timeout\n"); } -void -nv50_vm_flush(struct drm_device *dev, int engine) -{ - nv_wr32(dev, 0x100c80, (engine << 16) | 1); - if (!nv_wait(dev, 0x100c80, 0x00000001, 0x00000000)) - NV_ERROR(dev, "vm flush timeout: engine %d\n", engine); -} - |