From f31e04a96013c059fc90c98a878de14adbea524a Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Tue, 29 Apr 2008 19:34:22 +0200 Subject: nouveau: NV9x cards exist as well. --- shared-core/nouveau_state.c | 1 + 1 file changed, 1 insertion(+) (limited to 'shared-core/nouveau_state.c') diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 555955d4..0183b0b4 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -243,6 +243,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) break; case 0x50: case 0x80: /* gotta love NVIDIA's consistency.. */ + case 0x90: engine->instmem.init = nv50_instmem_init; engine->instmem.takedown= nv50_instmem_takedown; engine->instmem.populate = nv50_instmem_populate; -- cgit v1.2.3 From 74a9ea896e4c3f4bb3c7195872755ad40da30828 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 15 May 2008 11:13:03 +1000 Subject: drm: fix nouveau warning --- shared-core/nouveau_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core/nouveau_state.c') diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 0183b0b4..d9c6efe7 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -615,7 +615,7 @@ int nouveau_ioctl_getparam(struct drm_device *dev, void *data, struct drm_file * break; case NOUVEAU_GETPARAM_PCI_PHYSICAL: if ( dev -> sg ) - getparam->value=(uint64_t) dev->sg->virtual; + getparam->value=(unsigned long)dev->sg->virtual; else { DRM_ERROR("Requested PCIGART address, while no PCIGART was created\n"); -- cgit v1.2.3