diff options
Diffstat (limited to 'src/gallium/winsys/drm')
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c | 3 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/dri/Makefile | 12 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c index b6199f8e6db..89824b22540 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c @@ -77,6 +77,7 @@ nouveau_pipe_create(struct nouveau_context *nv) return NULL; switch (chipset & 0xf0) { +#if 0 case 0x00: hws_create = nv04_screen_create; hw_create = nv04_create; @@ -98,6 +99,7 @@ nouveau_pipe_create(struct nouveau_context *nv) hws_create = nv40_screen_create; hw_create = nv40_create; break; +#endif case 0x50: case 0x80: case 0x90: diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c index 881df985563..e3ee985afcd 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c @@ -19,6 +19,9 @@ nouveau_flags_from_usage(struct nouveau_context *nv, unsigned usage) struct nouveau_device *dev = nv->nv_screen->device; uint32_t flags = NOUVEAU_BO_LOCAL; + if (usage & NOUVEAU_BUFFER_USAGE_TRANSFER) + flags |= NOUVEAU_BO_GART; + if (usage & PIPE_BUFFER_USAGE_PIXEL) { if (usage & NOUVEAU_BUFFER_USAGE_TEXTURE) flags |= NOUVEAU_BO_GART; diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile index 3f3553b61d2..2e7a3a79f8f 100644 --- a/src/gallium/winsys/drm/nouveau/dri/Makefile +++ b/src/gallium/winsys/drm/nouveau/dri/Makefile @@ -7,13 +7,13 @@ MINIGLX_SOURCES = PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/nv04/libnv04.a \ - $(TOP)/src/gallium/drivers/nv10/libnv10.a \ - $(TOP)/src/gallium/drivers/nv20/libnv20.a \ - $(TOP)/src/gallium/drivers/nv30/libnv30.a \ - $(TOP)/src/gallium/drivers/nv40/libnv40.a \ $(TOP)/src/gallium/drivers/nv50/libnv50.a - +# $(TOP)/src/gallium/drivers/nv04/libnv04.a \ +# $(TOP)/src/gallium/drivers/nv10/libnv10.a \ +# $(TOP)/src/gallium/drivers/nv20/libnv20.a \ +# $(TOP)/src/gallium/drivers/nv30/libnv30.a \ +# $(TOP)/src/gallium/drivers/nv40/libnv40.a \ + DRIVER_SOURCES = \ nouveau_context_dri.c \ nouveau_screen_dri.c \ |