3 files changed, 32 insertions, 17 deletions

diff --git a/src/gallium/drivers/nv50/nv50_draw.c b/src/gallium/drivers/nv50/nv50_draw.c
index c6ed6838c6..790408c6df 100644
--- a/src/gallium/drivers/nv50/nv50_draw.c
+++ b/src/gallium/drivers/nv50/nv50_draw.c
@@ -3,53 +3,66 @@
 
 #include "nv50_context.h"
 
-struct nv50_draw_stage {
-	struct draw_stage draw;
+struct nv50_render_stage {
+	struct draw_stage stage;
 	struct nv50_context *nv50;
 };
 
+static INLINE struct nv50_render_stage *
+nv50_render_stage(struct draw_stage *stage)
+{
+	return (struct nv50_render_stage *)stage;
+}
+
 static void
-nv50_draw_point(struct draw_stage *draw, struct prim_header *prim)
+nv50_render_point(struct draw_stage *stage, struct prim_header *prim)
 {
 	NOUVEAU_ERR("\n");
 }
 
 static void
-nv50_draw_line(struct draw_stage *draw, struct prim_header *prim)
+nv50_render_line(struct draw_stage *stage, struct prim_header *prim)
 {
 	NOUVEAU_ERR("\n");
 }
 
 static void
-nv50_draw_tri(struct draw_stage *draw, struct prim_header *prim)
+nv50_render_tri(struct draw_stage *stage, struct prim_header *prim)
 {
 	NOUVEAU_ERR("\n");
 }
 
 static void
-nv50_draw_flush(struct draw_stage *draw, unsigned flags)
+nv50_render_flush(struct draw_stage *stage, unsigned flags)
 {
 }
 
 static void
-nv50_draw_reset_stipple_counter(struct draw_stage *draw)
+nv50_render_reset_stipple_counter(struct draw_stage *stage)
 {
 	NOUVEAU_ERR("\n");
 }
 
+static void
+nv50_render_destroy(struct draw_stage *stage)
+{
+	free(stage);
+}
+
 struct draw_stage *
 nv50_draw_render_stage(struct nv50_context *nv50)
 {
-	struct nv50_draw_stage *nv50draw = CALLOC_STRUCT(nv50_draw_stage);
+	struct nv50_render_stage *rs = CALLOC_STRUCT(nv50_render_stage);
 
-	nv50draw->nv50 = nv50;
-	nv50draw->draw.draw = nv50->draw;
-	nv50draw->draw.point = nv50_draw_point;
-	nv50draw->draw.line = nv50_draw_line;
-	nv50draw->draw.tri = nv50_draw_tri;
-	nv50draw->draw.flush = nv50_draw_flush;
-	nv50draw->draw.reset_stipple_counter = nv50_draw_reset_stipple_counter;
+	rs->nv50 = nv50;
+	rs->stage.draw = nv50->draw;
+	rs->stage.destroy = nv50_render_destroy;
+	rs->stage.point = nv50_render_point;
+	rs->stage.line = nv50_render_line;
+	rs->stage.tri = nv50_render_tri;
+	rs->stage.flush = nv50_render_flush;
+	rs->stage.reset_stipple_counter = nv50_render_reset_stipple_counter;
 
-	return &nv50draw->draw;
+	return &rs->stage;
 }
 
diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index f091779e3b..77ceb678f2 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -77,6 +77,8 @@ nv50_screen_get_paramf(struct pipe_screen *pscreen, int param)
 		return 16.0;
 	case PIPE_CAP_MAX_TEXTURE_LOD_BIAS:
 		return 4.0;
+	case PIPE_CAP_BITMAP_TEXCOORD_BIAS:
+		return 0.0;
 	default:
 		NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param);
 		return 0.0;
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.c b/src/gallium/winsys/dri/nouveau/nouveau_context.c
index 2e54729aa9..8dac08a5d2 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.c
@@ -72,7 +72,7 @@ nouveau_channel_context_create(struct nouveau_device *nvdev, unsigned chipset)
 		return NULL;
 	}
 
-	switch (chipset) {
+	switch (chipset & 0xf0) {
 	case 0x50:
 	case 0x80:
 		ret = nouveau_surface_channel_create_nv50(nvc);