aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:17 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:37 +1000
commit227c95d90a3c50defbc7b4f98605e13af4e6214c (patch)
tree381bd0f6bafd48383377ad276e1a6084acfaff90 /drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
parentdrm/nouveau/fifo: directly use instmem for runlists and polling areas (diff)
downloadlinux-dev-227c95d90a3c50defbc7b4f98605e13af4e6214c.tar.xz
linux-dev-227c95d90a3c50defbc7b4f98605e13af4e6214c.zip
drm/nouveau/gr: directly use instmem where currently possible
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
index f9d71185ee74..48bd9da606be 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
@@ -130,6 +130,7 @@ nv34_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
+ struct nvkm_device *device = (void *)parent;
struct nv20_gr *gr;
int ret;
@@ -138,8 +139,8 @@ nv34_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (ret)
return ret;
- ret = nvkm_gpuobj_new(nv_object(gr), NULL, 32 * 4, 16,
- NVOBJ_FLAG_ZERO_ALLOC, &gr->ctxtab);
+ ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, 32 * 4, 16, true,
+ &gr->ctxtab);
if (ret)
return ret;