From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 22 Mar 2012 23:10:22 +0000 (+1000)
Subject: drm/nouveau: fix thinko causing init to fail on cards without accel
X-Git-Tag: v3.4-rc1~69^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c61205b24b79cd3708e751ed9c33970f487686ab;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index a3ae91fa81414..a4886b36d0faf 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;