OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f0a68d
)
drm/nouveau: use NULL file_priv for DRM-created channels
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 31 May 2011 01:12:55 +0000
(11:12 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 23 Jun 2011 05:58:20 +0000
(15:58 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_state.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index
9aa96b9
..
9965063
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_state.c
@@
-449,8
+449,8
@@
nouveau_card_init_channel(struct drm_device *dev)
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;