summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-11-26 12:33:36 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-11-26 14:16:47 +1000
commit2c2e48684dbe49f27e51ec0b2a4aa50df0f0f295 (patch)
tree48715fd145374523a352a73b1bc8dd126c0d3c4f
parentf6686c8d07924a43559bec6ce9c0c9f11217145f (diff)
sw: fix oops if gpu has its display block disabled
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--nvkm/engine/software/nv50.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nvkm/engine/software/nv50.c b/nvkm/engine/software/nv50.c
index b574dd4b..5ce686ee 100644
--- a/nvkm/engine/software/nv50.c
+++ b/nvkm/engine/software/nv50.c
@@ -176,7 +176,7 @@ nv50_software_context_ctor(struct nouveau_object *parent,
if (ret)
return ret;
- chan->vblank.nr_event = pdisp->vblank->index_nr;
+ chan->vblank.nr_event = pdisp ? pdisp->vblank->index_nr : 0;
chan->vblank.event = kzalloc(chan->vblank.nr_event *
sizeof(*chan->vblank.event), GFP_KERNEL);
if (!chan->vblank.event)