Commit 7e8db29e authored Jun 20, 2016 by Dmitrii Tcvetkov Committed by Sasha Levin Jul 12, 2016

drm/nouveau: fix for disabled fbdev emulation

[ Upstream commit 52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216 ]

Hello,

after this commit:

commit f045f459d925138fe7d6193a8c86406bda7e49da
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Thu Jun 2 12:23:31 2016 +1000
    drm/nouveau/fbcon: fix out-of-bounds memory accesses

kernel started to oops when loading nouveau module when using GTX 780 Ti
video adapter. This patch fixes the problem.

Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=120591



Signed-off-by: Dmitrii Tcvetkov <demfloro@demfloro.ru>
Suggested-by: Ilia Mirkin <imirkin@alum.mit.edu>
Fixes: f045f459d925 ("nouveau_fbcon_init()")
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent d7c7764d

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -568,6 +568,7 @@ nouveau_fbcon_init(struct drm_device *dev)
		if (ret)
		goto fini;

		if (fbcon->helper.fbdev)
		fbcon->helper.fbdev->pixmap.buf_align = 4;
		return 0;