summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorStuart Bennett <sb476@cam.ac.uk>2007-12-27 01:10:52 +0000
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2008-01-04 05:07:35 +0100
commit381724a35b662302b70f9a5c04f1412ff2c2ad5b (patch)
tree413e02530a8d2ea9f04a1452d2e3725078f4e300 /shared-core
parent78d6649069a40c5c30ecc482eea803a5dc89c080 (diff)
[PATCH] nouveau: Fix nv20/30 context loading
Don't set the context as valid until it has been loaded
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/nv20_graph.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/nv20_graph.c b/shared-core/nv20_graph.c
index a21fde71..37a147b5 100644
--- a/shared-core/nv20_graph.c
+++ b/shared-core/nv20_graph.c
@@ -642,6 +642,7 @@ int nv20_graph_load_context(struct nouveau_channel *chan)
NV_WRITE(NV20_PGRAPH_CHANNEL_CTX_POINTER, inst);
NV_WRITE(NV20_PGRAPH_CHANNEL_CTX_XFER,
NV20_PGRAPH_CHANNEL_CTX_XFER_LOAD);
+ NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
nouveau_wait_for_idle(dev);
return 0;
@@ -759,7 +760,7 @@ int nv20_graph_init(struct drm_device *dev) {
NV_WRITE(NV10_PGRAPH_RDI_INDEX, 0x00EA000C);
NV_WRITE(NV10_PGRAPH_RDI_DATA, NV_READ(0x100324));
- NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
+ NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10000100);
NV_WRITE(NV10_PGRAPH_STATE , 0xFFFFFFFF);
NV_WRITE(NV04_PGRAPH_FIFO , 0x00000001);
@@ -854,7 +855,7 @@ int nv30_graph_init(struct drm_device *dev)
NV_WRITE(NV10_PGRAPH_TSTATUS(i), NV_READ(NV10_PFB_TSTATUS(i)));
}
- NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
+ NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10000100);
NV_WRITE(NV10_PGRAPH_STATE , 0xFFFFFFFF);
NV_WRITE(NV04_PGRAPH_FIFO , 0x00000001);