diff --git a/[refs] b/[refs] index b3bdf9fc2902..a185ca6637db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63718a0730c666edcac94c261d1df5edef80fd23 +refs/heads/master: 647bf61d0399515c526c125450cadaade79b1988 diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c index d0920acea741..b444aa7a8ae8 100644 --- a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c @@ -1863,14 +1863,8 @@ nvd0_display_init(struct drm_device *dev) if (push) { evo_mthd(push, 0x0088, 1); evo_data(push, NvEvoSync); - evo_mthd(push, 0x0084, 1); - evo_data(push, 0x00000000); - evo_mthd(push, 0x0084, 1); - evo_data(push, 0x80000000); - evo_mthd(push, 0x008c, 1); - evo_data(push, 0x00000000); evo_kick(push, nvd0_mast(dev)); - return 0; + return evo_sync(dev); } return -EBUSY;