diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-09-04 14:40:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-11-03 14:57:28 +1000 |
| commit | eb43004087507e71e7294fb786b715ae81242c34 (patch) | |
| tree | 24787b46ede27882b8f3aec0ab80dbfddaf80ae8 /drm/nouveau/nv50_display.c | |
| parent | 028eec345b60903fb2082e3cb104d13cf4c60458 (diff) | |
| download | nouveau-eb43004087507e71e7294fb786b715ae81242c34.tar.gz | |
drm: remove unnecessary usage of object handles
No longer required in a lot of cases, as objects are identified over NVIF
via an alternate mechanism since the rework.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nv50_display.c')
| -rw-r--r-- | drm/nouveau/nv50_display.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drm/nouveau/nv50_display.c b/drm/nouveau/nv50_display.c index 4ae87aed4..c053c50b3 100644 --- a/drm/nouveau/nv50_display.c +++ b/drm/nouveau/nv50_display.c @@ -68,7 +68,6 @@ nv50_chan_create(struct nvif_device *device, struct nvif_object *disp, const s32 *oclass, u8 head, void *data, u32 size, struct nv50_chan *chan) { - const u32 handle = (oclass[0] << 16) | head; struct nvif_sclass *sclass; int ret, i, n; @@ -81,7 +80,7 @@ nv50_chan_create(struct nvif_device *device, struct nvif_object *disp, while (oclass[0]) { for (i = 0; i < n; i++) { if (sclass[i].oclass == oclass[0]) { - ret = nvif_object_init(disp, handle, oclass[0], + ret = nvif_object_init(disp, 0, oclass[0], data, size, &chan->user); if (ret == 0) nvif_object_map(&chan->user); @@ -231,8 +230,8 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, if (!dmac->ptr) return -ENOMEM; - ret = nvif_object_init(&device->object, 0xd0000000, - NV_DMA_FROM_MEMORY, &(struct nv_dma_v0) { + ret = nvif_object_init(&device->object, 0, NV_DMA_FROM_MEMORY, + &(struct nv_dma_v0) { .target = NV_DMA_V0_TARGET_PCI_US, .access = NV_DMA_V0_ACCESS_RD, .start = dmac->handle + 0x0000, |