From: Ben Skeggs Date: Sat, 28 Jun 2014 10:44:07 +0000 (+1000) Subject: drm/nouveau/kms: take more care when pulling down accelerated fbcon X-Git-Tag: omap-for-v3.17/fixes-against-rc2~96^2~76 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b5098f3597195e9faf17e5a0cfca905d9a04d9f;p=pandora-kernel.git drm/nouveau/kms: take more care when pulling down accelerated fbcon Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c index 41be3424c906..8b17d7d49e26 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c @@ -915,9 +915,9 @@ nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc, struct drm_device *dev = drm->dev; if (state == ENTER_ATOMIC_MODE_SET) - nouveau_fbcon_save_disable_accel(dev); + nouveau_fbcon_accel_save_disable(dev); else - nouveau_fbcon_restore_accel(dev); + nouveau_fbcon_accel_restore(dev); return nv04_crtc_do_mode_set_base(crtc, fb, x, y, true); } Reading git-diff-tree failed