From a5381cac55e54a535acf752970886b659948563c Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Sun, 17 Aug 2008 00:41:50 +0200 Subject: nouveau: make it compile under 2.6.27 --- shared-core/nouveau_object.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'shared-core/nouveau_object.c') diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c index 894e7336..07b5a397 100644 --- a/shared-core/nouveau_object.c +++ b/shared-core/nouveau_object.c @@ -739,7 +739,12 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class, PAGE_SIZE, DMA_BIDIRECTIONAL); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + /* Not a 100% sure this is the right kdev in all cases. */ + if (dma_mapping_error(&dev->primary->kdev, dev->sg->busaddr[idx])) { +#else if (dma_mapping_error(dev->sg->busaddr[idx])) { +#endif return -ENOMEM; } } -- cgit v1.2.3 From f152482bdecaa16db36b20b445a480445d18048c Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 17 Sep 2008 14:49:04 +1000 Subject: nv50: add support for chipset 0x92 --- shared-core/nouveau_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core/nouveau_object.c') diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c index 07b5a397..5a44d41e 100644 --- a/shared-core/nouveau_object.c +++ b/shared-core/nouveau_object.c @@ -942,7 +942,7 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan) /* RAMFC */ size += 0x1000; /* PGRAPH context */ - size += 0x60000; + size += 0x70000; } DRM_DEBUG("ch%d PRAMIN size: 0x%08x bytes, base alloc=0x%08x\n", -- cgit v1.2.3