summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/drm/nouveau/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/winsys/drm/nouveau/common')
-rw-r--r--src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c2
-rw-r--r--src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
index b6199f8e6d..89824b2254 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 881df98556..e3ee985afc 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;