Patch "drm/nouveau/fbcon/nv11-: correctly account for ring space usage" has been added to the 4.1-stable tree

Patch "drm/nouveau/fbcon/nv11-: correctly account for ring space usage" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    drm/nouveau/fbcon/nv11-: correctly account for ring space usage

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-nouveau-fbcon-nv11-correctly-account-for-ring-space-usage.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From d108142c0840ce389cd9898aa76943b3fb430b83 Mon Sep 17 00:00:00 2001
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon, 29 Jun 2015 04:07:20 -0400
Subject: drm/nouveau/fbcon/nv11-: correctly account for ring space usage

From: Ilia Mirkin <imirkin@alum.mit.edu>

commit d108142c0840ce389cd9898aa76943b3fb430b83 upstream.

The RING_SPACE macro accounts how much space is used up so it's
important to ask it for the right amount. Incorrect accounting of this
can cause page faults down the line as writes are attempted outside of
the ring.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/nouveau/nv04_fbcon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
@@ -203,7 +203,7 @@ nv04_fbcon_accel_init(struct fb_info *in
 	if (ret)
 		return ret;
 
-	if (RING_SPACE(chan, 49)) {
+	if (RING_SPACE(chan, 49 + (device->info.chipset >= 0x11 ? 4 : 0))) {
 		nouveau_fbcon_gpu_lockup(info);
 		return 0;
 	}


Patches currently in stable-queue which might be from imirkin@alum.mit.edu are

queue-4.1/drm-nouveau-fbcon-nv11-correctly-account-for-ring-space-usage.patch