summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-23 09:10:22 +1000
committerDave Airlie <airlied@redhat.com>2012-03-26 09:35:56 +0100
commitc61205b24b79cd3708e751ed9c33970f487686ab (patch)
treea83fa311dfd2f4900a65c4d2e41d623dc7816349 /drivers/gpu/drm
parenta1978f74da69565a2e472394c7dcb2cfb31b3e45 (diff)
downloadlinux-3.10-c61205b24b79cd3708e751ed9c33970f487686ab.tar.gz
linux-3.10-c61205b24b79cd3708e751ed9c33970f487686ab.tar.bz2
linux-3.10-c61205b24b79cd3708e751ed9c33970f487686ab.zip
drm/nouveau: fix thinko causing init to fail on cards without accel
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index a3ae91fa814..a4886b36d0f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -852,7 +852,7 @@ nouveau_card_init(struct drm_device *dev)
if (ret)
goto out_pm;
- if (!dev_priv->noaccel) {
+ if (dev_priv->eng[NVOBJ_ENGINE_GR]) {
ret = nouveau_card_channel_init(dev);
if (ret)
goto out_fence;