diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-25 21:33:36 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-12-03 08:28:57 -0500 |
| commit | 13cd1a5511eb44a54187d91d4929a6592787a48b (patch) | |
| tree | 85aa59aeb0c673f0f2fe20d7085a6a305b9c10ff | |
| parent | 2fd04c81dc652689b104ab16eba26146dde5c43f (diff) | |
drm/nouveau/sw: fix oops if gpu has its display block disabled
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/software/nv50.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/software/nv50.c b/drivers/gpu/drm/nouveau/core/engine/software/nv50.c index b574dd4bb828..5ce686ee729e 100644 --- a/drivers/gpu/drm/nouveau/core/engine/software/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/software/nv50.c | |||
| @@ -176,7 +176,7 @@ nv50_software_context_ctor(struct nouveau_object *parent, | |||
| 176 | if (ret) | 176 | if (ret) |
| 177 | return ret; | 177 | return ret; |
| 178 | 178 | ||
| 179 | chan->vblank.nr_event = pdisp->vblank->index_nr; | 179 | chan->vblank.nr_event = pdisp ? pdisp->vblank->index_nr : 0; |
| 180 | chan->vblank.event = kzalloc(chan->vblank.nr_event * | 180 | chan->vblank.event = kzalloc(chan->vblank.nr_event * |
| 181 | sizeof(*chan->vblank.event), GFP_KERNEL); | 181 | sizeof(*chan->vblank.event), GFP_KERNEL); |
| 182 | if (!chan->vblank.event) | 182 | if (!chan->vblank.event) |