summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-09-04 15:27:53 -0400
committerIlia Mirkin <imirkin@alum.mit.edu>2014-10-04 22:05:13 -0400
commit02c1aee91ae22b58e777716ffd38397f9df0a087 (patch)
tree90ea79f74675fcf077be60865f47427d296dbff0
parent3cd4c8494c296c7583dfa7f0823a272c9e932e03 (diff)
copy: don't bother trying to create copy on pre-nva3
Only the NVA3/5/8/F tesla chips have a copy engine. Don't bother trying to create one on earlier tesla chips (and thus printing an error on failure). Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--src/nouveau_copy.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nouveau_copy.c b/src/nouveau_copy.c
index f46f0c3..d0b868d 100644
--- a/src/nouveau_copy.c
+++ b/src/nouveau_copy.c
@@ -61,6 +61,10 @@ nouveau_copy_init(ScreenPtr pScreen)
switch (pNv->Architecture) {
case NV_TESLA:
+ if (pNv->dev->chipset < 0xa3 ||
+ pNv->dev->chipset == 0xaa ||
+ pNv->dev->chipset == 0xac)
+ return FALSE;
data = &(struct nv04_fifo) {
.vram = NvDmaFB,
.gart = NvDmaTT,
@@ -87,7 +91,7 @@ nouveau_copy_init(ScreenPtr pScreen)
&pNv->ce_channel);
if (ret) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "[COPY} error allocating channel: %d\n", ret);
+ "[COPY] error allocating channel: %d\n", ret);
return FALSE;
}