diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-03-11 13:09:28 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-03-14 10:13:42 +1000 |
| commit | 1f5ff7f52bd7a69ee63765bff47ae90ca1a95237 (patch) | |
| tree | 1aeadf9a99371315cb009eaf2b46c096d3748207 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | 19f89279faca691c7e5222015324b9bac60cd836 (diff) | |
| download | op-kernel-dev-1f5ff7f52bd7a69ee63765bff47ae90ca1a95237.zip op-kernel-dev-1f5ff7f52bd7a69ee63765bff47ae90ca1a95237.tar.gz | |
drm/nouveau/fifo/gk104: make use of topology info during gpfifo construction
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 30b5958..fcc83b7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -215,13 +215,13 @@ nouveau_accel_init(struct nouveau_drm *drm) if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) { ret = nouveau_channel_new(drm, &drm->device, - KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE0| - KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE1, + NVA06F_V0_ENGINE_CE0 | + NVA06F_V0_ENGINE_CE1, 0, &drm->cechan); if (ret) NV_ERROR(drm, "failed to create ce channel, %d\n", ret); - arg0 = KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR; + arg0 = NVA06F_V0_ENGINE_GR; arg1 = 1; } else if (device->info.chipset >= 0xa3 && |
