diff options
| author | Ilia Mirkin | 2013-09-05 10:45:03 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2013-11-08 06:37:39 +0100 |
| commit | 8aa816b0bbcefa8517d7e10586d7dbb0ead3c4c1 (patch) | |
| tree | 6bf521a265db307596ba6a679a8e59e427400ae7 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | drm/nv10: introduce a new NV_11 card type (diff) | |
| download | kernel-qcow2-linux-8aa816b0bbcefa8517d7e10586d7dbb0ead3c4c1.tar.gz kernel-qcow2-linux-8aa816b0bbcefa8517d7e10586d7dbb0ead3c4c1.tar.xz kernel-qcow2-linux-8aa816b0bbcefa8517d7e10586d7dbb0ead3c4c1.zip | |
drm/nv10: fix chipset checks, mostly for the benefit of nv1a
NV1A is numerically higher than NV17 but generationally lower. Use the
new card type to help disambiguate.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
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 69bf82d126ea..c0a79c715827 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -142,7 +142,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->chipset < 0x17) ret = nv10_fence_create(drm); + else if (device->card_type < NV_11 || + 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); |