Patch "drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads" has been added to the 4.1-stable tree

Patch "drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads" 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/kms/nv50-: guard against enabling cursor on disabled heads

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-kms-nv50-guard-against-enabling-cursor-on-disabled-heads.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 697bb728d9e2367020aa0c5af7363809d7658e43 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 28 Jul 2015 17:20:57 +1000
Subject: drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads

From: Ben Skeggs <bskeggs@redhat.com>

commit 697bb728d9e2367020aa0c5af7363809d7658e43 upstream.

Userspace has started doing this, which upsets the display class hw
error checking in various unpleasant ways.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -979,7 +979,7 @@ nv50_crtc_cursor_show_hide(struct nouvea
 {
 	struct nv50_mast *mast = nv50_mast(nv_crtc->base.dev);
 
-	if (show && nv_crtc->cursor.nvbo)
+	if (show && nv_crtc->cursor.nvbo && nv_crtc->base.enabled)
 		nv50_crtc_cursor_show(nv_crtc);
 	else
 		nv50_crtc_cursor_hide(nv_crtc);


Patches currently in stable-queue which might be from bskeggs@redhat.com are

queue-4.1/drm-nouveau-kms-nv50-guard-against-enabling-cursor-on-disabled-heads.patch
queue-4.1/drm-nouveau-fbcon-nv11-correctly-account-for-ring-space-usage.patch