From: Ben Skeggs Date: Tue, 26 Nov 2013 02:33:36 +0000 (+1000) Subject: drm/nouveau/sw: fix oops if gpu has its display block disabled X-Git-Tag: v3.13-rc8~13^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13cd1a5511eb44a54187d91d4929a6592787a48b;p=platform%2Fkernel%2Flinux-stable.git drm/nouveau/sw: fix oops if gpu has its display block disabled Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/engine/software/nv50.c b/drivers/gpu/drm/nouveau/core/engine/software/nv50.c index b574dd4..5ce686e 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, 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)