From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 16 Mar 2010 03:18:39 +0000 (+1000)
Subject: nv50: fix texturing from >=4GiB mark
X-Git-Tag: mesa-7.9-rc1~4578^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95d43bccde9ba5c0727bb2b9e52d050dacfa0cfa;p=platform%2Fupstream%2Fmesa.git

nv50: fix texturing from >=4GiB mark
---

diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c
index 4c48b12..eb64f6c 100644
--- a/src/gallium/drivers/nv50/nv50_tex.c
+++ b/src/gallium/drivers/nv50/nv50_tex.c
@@ -137,7 +137,8 @@ nv50_tex_construct(struct nv50_context *nv50, struct nouveau_stateobj *so,
 	so_data (so, nv50_tex_format_list[i].hw);
 	so_reloc(so, mt->base.bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_LOW |
 		 NOUVEAU_BO_RD, 0, 0);
-	so_data (so, mode);
+	so_reloc(so, mt->base.bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_HIGH |
+		 NOUVEAU_BO_RD | NOUVEAU_BO_OR, mode, mode);
 	so_data (so, 0x00300000);
 	so_data (so, mt->base.base.width0 | (1 << 31));
 	so_data (so, (mt->base.base.last_level << 28) |