public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Ortwin Glück" <odi@odi.ch>
To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: drm/nouveau: Work around a crash during boot if noaccel is set.
Date: Fri, 24 Aug 2012 16:52:54 +0200	[thread overview]
Message-ID: <50379546.6070802@odi.ch> (raw)

NB: still broken in 3.5 as well.

Signed-off-by: Ortwin Glück <odi@odi.ch>
---
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c 
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 
*dev, int crtc)
  	struct nouveau_software_priv *psw = 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 != crtc)
  			continue;

                 reply	other threads:[~2012-08-24 14:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50379546.6070802@odi.ch \
    --to=odi@odi.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox