git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc' into release
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_channel.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_channel.c
b/drivers/gpu/drm/nouveau/nouveau_channel.c
index
d1c7f8c
..
343d718
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_channel.c
@@
-158,6
+158,8
@@
nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
return ret;
}
+ nouveau_dma_pre_init(chan);
+
/* Locate channel's user control regs */
if (dev_priv->card_type < NV_40)
user = NV03_USER(channel);