diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:14 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:27 +1000 |
| commit | 45ea503161af6e94d593a59e8cca8981d0435d5c (patch) | |
| tree | 63d41c696393782760b996c9604610fd6e6da5f2 /drivers/gpu | |
| parent | 384af9aceaf8ee1e2d3791cc89a32c161d67bb57 (diff) | |
drm/nouveau/core: switch to gpuobj accessor macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/ramht.c | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c index c6e5f7a7f005..f99b446c1e10 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c @@ -34,8 +34,10 @@ nvkm_gpuobj_destroy(struct nvkm_gpuobj *gpuobj) int i; if (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE) { + nvkm_kmap(gpuobj); for (i = 0; i < gpuobj->size; i += 4) - nv_wo32(gpuobj, i, 0x00000000); + nvkm_wo32(gpuobj, i, 0x00000000); + nvkm_done(gpuobj); } if (gpuobj->node) @@ -123,8 +125,10 @@ nvkm_gpuobj_create_(struct nvkm_object *parent, struct nvkm_object *engine, } if (flags & NVOBJ_FLAG_ZERO_ALLOC) { + nvkm_kmap(gpuobj); for (i = 0; i < gpuobj->size; i += 4) - nv_wo32(gpuobj, i, 0x00000000); + nvkm_wo32(gpuobj, i, 0x00000000); + nvkm_done(gpuobj); } return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ramht.c b/drivers/gpu/drm/nouveau/nvkm/core/ramht.c index ebd4d15479bd..c61bb0fa93f6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/ramht.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/ramht.c @@ -42,35 +42,43 @@ nvkm_ramht_hash(struct nvkm_ramht *ramht, int chid, u32 handle) int nvkm_ramht_insert(struct nvkm_ramht *ramht, int chid, u32 handle, u32 context) { + struct nvkm_gpuobj *gpuobj = &ramht->gpuobj; struct nvkm_bar *bar = nvkm_bar(ramht); + int ret = -ENOSPC; u32 co, ho; co = ho = nvkm_ramht_hash(ramht, chid, handle); + nvkm_kmap(gpuobj); do { - if (!nv_ro32(ramht, co + 4)) { - nv_wo32(ramht, co + 0, handle); - nv_wo32(ramht, co + 4, context); + if (!nvkm_ro32(gpuobj, co + 4)) { + nvkm_wo32(gpuobj, co + 0, handle); + nvkm_wo32(gpuobj, co + 4, context); if (bar) bar->flush(bar); - return co; + ret = co; + break; } co += 8; if (co >= nv_gpuobj(ramht)->size) co = 0; } while (co != ho); + nvkm_done(gpuobj); - return -ENOMEM; + return ret; } void nvkm_ramht_remove(struct nvkm_ramht *ramht, int cookie) { + struct nvkm_gpuobj *gpuobj = &ramht->gpuobj; struct nvkm_bar *bar = nvkm_bar(ramht); - nv_wo32(ramht, cookie + 0, 0x00000000); - nv_wo32(ramht, cookie + 4, 0x00000000); + nvkm_kmap(gpuobj); + nvkm_wo32(gpuobj, cookie + 0, 0x00000000); + nvkm_wo32(gpuobj, cookie + 4, 0x00000000); if (bar) bar->flush(bar); + nvkm_done(gpuobj); } static struct nvkm_oclass |