diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 05:13:15 +1000 |
| commit | f45f55c4bbf8a9f9c607e5f6013abac60427e3f7 (patch) | |
| tree | 17aa46b435a9708f6c8331796afdd83c750322c6 /drivers/gpu/drm/nouveau/nouveau_chan.c | |
| parent | drm/nouveau: port to nvif client/device/objects (diff) | |
| download | linux-dev-f45f55c4bbf8a9f9c607e5f6013abac60427e3f7.tar.xz linux-dev-f45f55c4bbf8a9f9c607e5f6013abac60427e3f7.zip | |
drm/nouveau: remove (most) hardcoded object handle usage
The PFIFO<->EVO sync buffers will be fixed up later when inter-channel
sync in general is improved.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_chan.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index 2072518f93fa..676b1b9a3086 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -335,7 +335,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) /* allocate software object class (used for fences on <= nv05) */ if (device->info.family < NV_DEVICE_INFO_V0_CELSIUS) { - ret = nvif_object_init(chan->object, NULL, NvSw, 0x006e, + ret = nvif_object_init(chan->object, NULL, 0x006e, 0x006e, NULL, 0, &chan->nvsw); if (ret) return ret; @@ -349,7 +349,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) return ret; BEGIN_NV04(chan, NvSubSw, 0x0000, 1); - OUT_RING (chan, NvSw); + OUT_RING (chan, chan->nvsw.handle); FIRE_RING (chan); } |