diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2013-02-14 12:59:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 16:00:52 +1000 |
| commit | 60e5cb79cbd27a36836fc04177d7c323ee873563 (patch) | |
| tree | 31ee56acd841375f6fddbe3572d57916b00142b2 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | drm/nv84-/fence: abstract class emit/sync functions to virt+sequence (diff) | |
| download | linux-dev-60e5cb79cbd27a36836fc04177d7c323ee873563.tar.xz linux-dev-60e5cb79cbd27a36836fc04177d7c323ee873563.zip | |
drm/nv17/fence: split from nv10 code
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index ce91c8d43bb7..f9144910b78e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -160,7 +160,8 @@ nouveau_accel_init(struct nouveau_drm *drm) /* initialise synchronisation routines */ if (device->card_type < NV_10) ret = nv04_fence_create(drm); - else if (device->card_type < NV_50) ret = nv10_fence_create(drm); + else if (device->chipset < 0x17) ret = nv10_fence_create(drm); + else if (device->card_type < NV_50) ret = nv17_fence_create(drm); else if (device->chipset < 0x84) ret = nv50_fence_create(drm); else if (device->card_type < NV_C0) ret = nv84_fence_create(drm); else ret = nvc0_fence_create(drm); |