diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-11-21 13:21:12 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-22 11:11:10 +1000 |
| commit | ace5a9b8dbc66ada0aa8c5f67b93527590822c7c (patch) | |
| tree | e50b55693f7a15d314f88267a075aa57d9841f70 /drivers/gpu | |
| parent | 3bb076af2ae571a48465972d5747175cec3564cd (diff) | |
| download | linux-ace5a9b8dbc66ada0aa8c5f67b93527590822c7c.tar.gz linux-ace5a9b8dbc66ada0aa8c5f67b93527590822c7c.tar.bz2 linux-ace5a9b8dbc66ada0aa8c5f67b93527590822c7c.zip | |
drm/nouveau: use the correct fence implementation for nv50
Only compile time tested, noticed nv50_fence_create was never used,
so fix this. This will probably fix vblank on nv50 cards.
Hopefully this is still in time for 3.7 final release.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -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 0910125cbbc3..8503b2ea570a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -129,7 +129,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 < 0x84) ret = nv10_fence_create(drm); + else if (device->card_type < NV_50) ret = nv10_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); if (ret) { |