Patch "drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards" has been added to the 4.13-stable tree

Patch "drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards" has been added to the 4.13-stable tree

[gregkh]

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

    drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards

to the 4.13-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-fix-oops-during-dp-irq-handling-on-non-mst-boards.patch
and it can be found in the queue-4.13 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 227f66d2f9954f68375736af62ebcd73c6754d69 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 3 Oct 2017 16:24:28 +1000
Subject: drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards

From: Ben Skeggs <bskeggs@redhat.com>

commit 227f66d2f9954f68375736af62ebcd73c6754d69 upstream.

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

---
 drivers/gpu/drm/nouveau/nv50_display.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3281,11 +3281,14 @@ nv50_mstm = {
 void
 nv50_mstm_service(struct nv50_mstm *mstm)
 {
-	struct drm_dp_aux *aux = mstm->mgr.aux;
+	struct drm_dp_aux *aux = mstm ? mstm->mgr.aux : NULL;
 	bool handled = true;
 	int ret;
 	u8 esi[8] = {};
 
+	if (!aux)
+		return;
+
 	while (handled) {
 		ret = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8);
 		if (ret != 8) {


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

queue-4.13/drm-nouveau-mmu-flush-tlbs-before-deleting-page-tables.patch
queue-4.13/drm-nouveau-kms-nv50-fix-oops-during-dp-irq-handling-on-non-mst-boards.patch
queue-4.13/drm-nouveau-bsp-g92-disable-by-default.patch