Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da6004b8 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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
parents 776d1e38 ace5a9b8

drivers/gpu/drm/nouveau/nouveau_drm.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {