diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-11 14:22:59 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-11 14:22:59 +1000 |
| commit | 5ccadac9e3b1beb8ac0177c7a39862094fe3b6de (patch) | |
| tree | 4379b1ceaf7f701b4188e753f9a3e082ed4a4306 /shared-core | |
| parent | 13e1377044d581d692af77656e3bc32c9eb183f7 (diff) | |
nouveau/nv50: G80 fixes.
Again, no hardware, so no idea if it'll even work yet. I understand how
the PRAMIN setup works now, un-hardcoding stuff will come "RealSoonNow(tm)".
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/nv50_fifo.c | 3 | ||||
| -rw-r--r-- | shared-core/nv50_instmem.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/shared-core/nv50_fifo.c b/shared-core/nv50_fifo.c index d4c3ca87..ee1fb887 100644 --- a/shared-core/nv50_fifo.c +++ b/shared-core/nv50_fifo.c @@ -235,8 +235,7 @@ nv50_fifo_create_context(drm_device_t *dev, int channel) DRM_DEBUG("ch%d\n", channel); if (IS_G80) { - uint32_t ramfc_offset; - ramfc_offset = chan->ramin->gpuobj->im_pramin->start + 0x1000; + uint32_t ramfc_offset = chan->ramin->gpuobj->im_pramin->start; if ((ret = nouveau_gpuobj_new_fake(dev, ramfc_offset, 0x100, NVOBJ_FLAG_ZERO_ALLOC | NVOBJ_FLAG_ZERO_FREE, diff --git a/shared-core/nv50_instmem.c b/shared-core/nv50_instmem.c index 4aca9e7d..1ea64b35 100644 --- a/shared-core/nv50_instmem.c +++ b/shared-core/nv50_instmem.c @@ -68,7 +68,7 @@ nv50_instmem_init(drm_device_t *dev) } else { unk = cb + 0x5400; cb0 = cb + 0x5440; - cb1 = cb + 0x1438; + cb1 = cb + 0x1478; } DRM_DEBUG("PRAMIN config:\n"); |