Mesa (master): nouveau: Use proper SIFM object on NV30
Patrice Mandin
pmandin at kemper.freedesktop.org
Wed Mar 4 19:35:22 UTC 2009
Module: Mesa
Branch: master
Commit: 69e42ec4568e824bf16271830751436afb2e8ef9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69e42ec4568e824bf16271830751436afb2e8ef9
Author: Patrice Mandin <patmandin at gmail.com>
Date: Wed Mar 4 20:34:54 2009 +0100
nouveau: Use proper SIFM object on NV30
---
src/gallium/drivers/nv04/nv04_surface_2d.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/nv04/nv04_surface_2d.c b/src/gallium/drivers/nv04/nv04_surface_2d.c
index e8fd316..3c8257a 100644
--- a/src/gallium/drivers/nv04/nv04_surface_2d.c
+++ b/src/gallium/drivers/nv04/nv04_surface_2d.c
@@ -437,13 +437,17 @@ nv04_surface_2d_init(struct nouveau_winsys *nvws)
return NULL;
}
- if (chan->device->chipset < 0x10) {
- class = NV04_SCALED_IMAGE_FROM_MEMORY;
- } else
- if (chan->device->chipset < 0x40) {
- class = NV10_SCALED_IMAGE_FROM_MEMORY;
- } else {
+ switch (chan->device->chipset & 0xf0) {
+ case 0x30:
+ class = NV30_SCALED_IMAGE_FROM_MEMORY;
+ break;
+ case 0x40:
+ case 0x60:
class = NV40_SCALED_IMAGE_FROM_MEMORY;
+ break;
+ default:
+ class = NV04_SCALED_IMAGE_FROM_MEMORY;
+ break;
}
ret = nouveau_grobj_alloc(chan, handle++, class, &ctx->sifm);
More information about the mesa-commit
mailing list