diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-11-21 22:20:45 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-21 22:21:01 -0500 |
| commit | da6004b8d02f79b893d425d11400ccad2b7c2efd (patch) | |
| tree | a00eed33115598e29a47e43cd54950e5c41a7ef0 /drivers/gpu/drm | |
| parent | 776d1e38c5934ba4d2e300fe4208602babae4c1d (diff) | |
| parent | ace5a9b8dbc66ada0aa8c5f67b93527590822c7c (diff) | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
nouveau: one more regression fix.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: use the correct fence implementation for nv50
Diffstat (limited to 'drivers/gpu/drm')
| -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) | |||
| 129 | 129 | ||
| 130 | /* initialise synchronisation routines */ | 130 | /* initialise synchronisation routines */ |
| 131 | if (device->card_type < NV_10) ret = nv04_fence_create(drm); | 131 | if (device->card_type < NV_10) ret = nv04_fence_create(drm); |
| 132 | else if (device->chipset < 0x84) ret = nv10_fence_create(drm); | 132 | else if (device->card_type < NV_50) ret = nv10_fence_create(drm); |
| 133 | else if (device->chipset < 0x84) ret = nv50_fence_create(drm); | ||
| 133 | else if (device->card_type < NV_C0) ret = nv84_fence_create(drm); | 134 | else if (device->card_type < NV_C0) ret = nv84_fence_create(drm); |
| 134 | else ret = nvc0_fence_create(drm); | 135 | else ret = nvc0_fence_create(drm); |
| 135 | if (ret) { | 136 | if (ret) { |