diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2011-08-23 10:23:11 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-09 17:24:00 +1000 |
| commit | cfd8be088e97a762902a4820f501fb13102984e9 (patch) | |
| tree | d913c9553696025f445692dbef1cf1010fb17c1b /drivers/gpu | |
| parent | drm/nv50/crtc: Bail out if FB is not bound to crtc (diff) | |
| download | linux-dev-cfd8be088e97a762902a4820f501fb13102984e9.tar.xz linux-dev-cfd8be088e97a762902a4820f501fb13102984e9.zip | |
drm/nouveau: fix oops on pre-semaphore hardware
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 8d02d875376d..c919cfc8f2fd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -530,7 +530,8 @@ nouveau_fence_channel_init(struct nouveau_channel *chan) nouveau_gpuobj_ref(NULL, &obj); if (ret) return ret; - } else { + } else + if (USE_SEMA(dev)) { /* map fence bo into channel's vm */ ret = nouveau_bo_vma_add(dev_priv->fence.bo, chan->vm, &chan->fence.vma); |