diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2012-11-11 23:00:09 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-19 02:52:20 +0400 |
| commit | bf7e438bcaff4b732f86bb2eb48fc4fee04dc31b (patch) | |
| tree | 060a18ae730248c522dd22d0fb9b76039a95b052 /drivers | |
| parent | 1f150b3e7a722ebfc68eec5d83a9fe1ee8d75d71 (diff) | |
| download | linux-bf7e438bcaff4b732f86bb2eb48fc4fee04dc31b.tar.xz | |
drm/nouveau: fix crash with noaccel=1
Reported-by: Ortwin Glück <odi@odi.ch>
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index cc79c796afee..cbf1fc60a386 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -241,6 +241,10 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) if (unlikely(!abi16)) return -ENOMEM; + + if (!drm->channel) + return nouveau_abi16_put(abi16, -ENODEV); + client = nv_client(abi16->client); if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0) |