OSDN Git Service
(root)
/
android-x86
/
external-libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6777530
)
nouveau: revert unintended change.
author
Ben Skeggs
<skeggsb@gmail.com>
Tue, 16 Oct 2007 03:43:57 +0000
(14:43 +1100)
committer
Ben Skeggs
<skeggsb@gmail.com>
Tue, 16 Oct 2007 03:43:57 +0000
(14:43 +1100)
shared-core/nouveau_mem.c
patch
|
blob
|
history
diff --git
a/shared-core/nouveau_mem.c
b/shared-core/nouveau_mem.c
index
9769178
..
e2f0b38
100644
(file)
--- a/
shared-core/nouveau_mem.c
+++ b/
shared-core/nouveau_mem.c
@@
-399,7
+399,8
@@
int nouveau_mem_init(struct drm_device *dev)
}
/*Note: this is *not* just NV50 code, but only used on NV50 for now */
- if (dev_priv->gart_info.type == NOUVEAU_GART_NONE) {
+ if (dev_priv->gart_info.type == NOUVEAU_GART_NONE &&
+ dev_priv->card_type >= NV_50) {
ret = nouveau_sgdma_init(dev);
if (!ret) {
ret = nouveau_sgdma_nottm_hack_init(dev);