commit f8656f0baa316d1f08e224248e0b40ade85a4e80
author Ben Skeggs <bskeggs@redhat.com> Tue May 31 11:12:55 2011 +1000
committer Ben Skeggs <bskeggs@redhat.com> Thu Jun 23 15:58:20 2011 +1000
tree bfe0172312732f40f86c09c041f966da2f38122b
parent 3f0a68d8f8ba9d6c0cd9df948fbba90944c3da62

drm/nouveau: use NULL file_priv for DRM-created channels

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/nouveau_state.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 9aa96b9..9965063 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -449,8 +449,8 @@
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	int ret;
 
-	ret = nouveau_channel_alloc(dev, &dev_priv->channel,
-				    (struct drm_file *)-2, NvDmaFB, NvDmaTT);
+	ret = nouveau_channel_alloc(dev, &dev_priv->channel, NULL,
+				    NvDmaFB, NvDmaTT);
 	if (ret)
 		return ret;