diff options
| author | Matthieu Castet <castet.matthieu@free.fr> | 2007-04-01 00:44:11 +0200 |
|---|---|---|
| committer | Matthieu Castet <castet.matthieu@free.fr> | 2007-04-01 00:44:11 +0200 |
| commit | 223061e0846a95d4a3dba84b36afb2cef313bae9 (patch) | |
| tree | 168566bfc78bd7f3b320633b18134ef6c548b981 /shared-core | |
| parent | ddb1715e06f6b5ab81ed0bc6667104bb9e7fcdee (diff) | |
nouveau : set the correct PGRAPH_CTX_CONTROL register
"5a072f32 (Stephane Marchesin 2007-02-03 04:57:06 +0100" broke nv10 ctx switch by setting wrong PGRAPH_CTX_CONTROL reg
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/nv10_graph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/nv10_graph.c b/shared-core/nv10_graph.c index 3ca843d4..bf36136d 100644 --- a/shared-core/nv10_graph.c +++ b/shared-core/nv10_graph.c @@ -554,7 +554,7 @@ void nouveau_nv10_context_switch(drm_device_t *dev) nouveau_wait_for_idle(dev); - NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10000000); + NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10000000); NV_WRITE(NV10_PGRAPH_CTX_USER, (NV_READ(NV10_PGRAPH_CTX_USER) & 0xffffff) | (0x1f << 24)); nouveau_wait_for_idle(dev); @@ -570,7 +570,7 @@ void nouveau_nv10_context_switch(drm_device_t *dev) nouveau_wait_for_idle(dev); #endif - NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10010100); + NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100); NV_WRITE(NV10_PGRAPH_CTX_USER, channel << 24); NV_WRITE(NV10_PGRAPH_FFINTFC_ST2, NV_READ(NV10_PGRAPH_FFINTFC_ST2)&0xCFFFFFFF); @@ -633,7 +633,7 @@ int nv10_graph_init(drm_device_t *dev) { NV_WRITE(NV10_PGRAPH_TSTATUS(i), NV_READ(NV10_PFB_TSTATUS(i))); } - NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10010100); + NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100); NV_WRITE(NV10_PGRAPH_STATE , 0xFFFFFFFF); NV_WRITE(NV04_PGRAPH_FIFO , 0x00000001); |