Commit da6004b8 authored by Dave Airlie's avatar Dave Airlie

Merge branch 'drm-nouveau-fixes' of...

Merge branch 'drm-nouveau-fixes' of git:// into drm-fixes

nouveau: one more regression fix.

* 'drm-nouveau-fixes' of git://
  drm/nouveau: use the correct fence implementation for nv50
parents 776d1e38 ace5a9b8
......@@ -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) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment