From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?ISO-8859-1?Q?Ortwin_Gl=FCck?= <odi@odi.ch>
Subject: drm/nouveau: Work around a crash during boot if noaccel is set.
Date: Fri, 24 Aug 2012 16:52:54 +0200
Message-ID: <50379546.6070802@odi.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

NB: still broken in 3.5 as well.

Signed-off-by: Ortwin Gl=FCck <odi@odi.ch>
---
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c=20
b/drivers/gpu/drm/nouveau/nv50_display.c
index b244d99..c7ffa63 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -650,6 +650,12 @@ nv50_display_vblank_crtc_handler(struct drm_device=
=20
*dev, int crtc)
  	struct nouveau_software_priv *psw =3D nv_engine(dev, NVOBJ_ENGINE_SW=
);
  	struct nouveau_software_chan *pch, *tmp;

+        if (!psw) {
+                WARN_ON_ONCE(1);
+                printk(KERN_ERR "NULL software engine\n");
+                return;
+        }
+
  	list_for_each_entry_safe(pch, tmp, &psw->vblank, vblank.list) {
  		if (pch->vblank.head !=3D crtc)
  			continue;